From 8c6ee08ddf01c1266c10ef940c08d1a9a1ba90e4 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 18 Oct 2009 11:36:49 +0000
Subject: Patch #84008 by deviantintegral, plumbley, lilou, lambic: fixed
 timer_read() returns NULL (no value) after timer_stop(). Added timer tests.

---
 includes/bootstrap.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'includes')

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];
-- 
cgit v1.2.3