Merge pull request #8 from macopedia/fix_treshold_notice

Fix error when calling method on non object when filters are disabled.
AOEpeople · Nov 14, 2014 · 4ba117c · 4ba117c
2 parents ea5c7af + 196d8a4
commit 4ba117c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/code/community/Varien/Profiler.php b/app/code/community/Varien/Profiler.php
@@ -521,7 +521,7 @@ public static function checkThresholds()
     {
         $conf = self::getConfiguration();
         $totals = self::getTotals();
-        return (!$conf->filters->timeThreshold || $totals['time'] > $conf->filters->timeThreshold) &&
+        return !$conf->enableFilters || (!$conf->filters->timeThreshold || $totals['time'] > $conf->filters->timeThreshold) &&
                (!$conf->filters->memoryThreshold || $totals['realmem'] > $conf->filters->memoryThreshold);
     }