Merge branch 'release/1.0.2'

getgrav · Dec 12, 2015 · f7696b6 · f7696b6
2 parents 2bb23ef + f8aa9fe
commit f7696b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.2
+## 12/11/2015
+
+1. [](#bugfix)
+    * Fix for timing display in debugbar
+
 # v1.0.1
 ## 12/11/2015
 

diff --git a/system/defines.php b/system/defines.php
@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.0.1');
+define('GRAV_VERSION', '1.0.2');
 define('DS', '/');
 
 // Directories and Paths

diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php
@@ -107,7 +107,7 @@ public function startTimer($name, $description = null)
 
     public function stopTimer($name)
     {
-        if (isset($this->timers[$name]) && ($name[0] == '_' || $this->grav['config']->get('system.debugger.enabled'))) {
+        if (in_array($name, $this->timers) && ($name[0] == '_' || $this->grav['config']->get('system.debugger.enabled'))) {
             $this->debugbar['time']->stopMeasure($name);
         }