summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-09-06 06:43:03 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-09-06 06:43:03 +0000
commitbdfa735e1c9c3a8ec1cdab42f99f93a2083cca2e (patch)
tree05b52f6ffa247befeac0b844ccfc316275661a20
parent7617a16f85dab951adab28279924e0bcd3932ee3 (diff)
downloadbrdo-bdfa735e1c9c3a8ec1cdab42f99f93a2083cca2e.tar.gz
brdo-bdfa735e1c9c3a8ec1cdab42f99f93a2083cca2e.tar.bz2
#47535 by Wesley Tanaka and nickl. Fix a PHP notice with timers.
-rw-r--r--includes/bootstrap.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index fe36c53b6..424e0b07f 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -60,7 +60,10 @@ function timer_read($name) {
$stop = (float)$usec + (float)$sec;
$diff = round(($stop - $timers[$name]['start']) * 1000, 2);
- return $timers[$name]['time'] + $diff;
+ if (isset($timers[$name]['time'])) {
+ $diff += $timers[$name]['time'];
+ }
+ return $diff;
}
/**