Fix issue with previous commit.

pocketarc · pocketarc · commit 60b5dd85022f · 2023-06-13T07:09:25.000+01:00
diff --git a/system/core/Loader.php b/system/core/Loader.php
@@ -501,13 +501,13 @@ public function view($view, $vars = array(), $return = FALSE)
 		$measure = "View - $view";
 		$CI =& get_instance();
 
-		if ($CI->debugbar) {
+		if (property_exists($CI, "debugbar") && $CI->debugbar) {
 			$CI->debugbar["time"]->startMeasure($measure);
 		}
 
 		$result = $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return));
 
-		if ($CI->debugbar) {
+		if (property_exists($CI, "debugbar") && $CI->debugbar && $CI->debugbar["time"]->hasStartedMeasure($measure)) {
 			$CI->debugbar["time"]->stopMeasure($measure);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -501,13 +501,13 @@ public function view($view, $vars = array(), $return = FALSE)`
`501`	`501`	`$measure = "View - $view";`
`502`	`502`	`$CI =& get_instance();`
`503`	`503`
`504`		`- if ($CI->debugbar) {`
	`504`	`+ if (property_exists($CI, "debugbar") && $CI->debugbar) {`
`505`	`505`	`$CI->debugbar["time"]->startMeasure($measure);`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`$result = $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_prepare_view_vars($vars), '_ci_return' => $return));`
`509`	`509`
`510`		`- if ($CI->debugbar) {`
	`510`	`+ if (property_exists($CI, "debugbar") && $CI->debugbar && $CI->debugbar["time"]->hasStartedMeasure($measure)) {`
`511`	`511`	`$CI->debugbar["time"]->stopMeasure($measure);`
`512`	`512`	`}`
`513`	`513`