diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-10-18 11:36:49 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-10-18 11:36:49 +0000 |
| commit | 8c6ee08ddf01c1266c10ef940c08d1a9a1ba90e4 (patch) | |
| tree | a0e71a14e66e0456f3f0a0cfdb2c89536784de02 /includes | |
| parent | 2dc3c05a2b40653f10bd57e76007de22b6468a8f (diff) | |
| download | brdo-8c6ee08ddf01c1266c10ef940c08d1a9a1ba90e4.tar.gz brdo-8c6ee08ddf01c1266c10ef940c08d1a9a1ba90e4.tar.bz2 | |
Patch #84008 by deviantintegral, plumbley, lilou, lambic: fixed timer_read() returns NULL (no value) after timer_stop(). Added timer tests.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index ad0186d5d..192f28e1a 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -248,6 +248,7 @@ function timer_read($name) { } return $diff; } + return $timers[$name]['time']; } /** @@ -262,7 +263,12 @@ function timer_read($name) { function timer_stop($name) { global $timers; - $timers[$name]['time'] = timer_read($name); + if (isset($timers[$name]['time'])) { + $timers[$name]['time'] += timer_read($name); + } + else { + $timers[$name]['time'] = timer_read($name); + } unset($timers[$name]['start']); return $timers[$name]; |