Try again at fixing errors in 5.2

cakephp · Aug 9, 2012 · b29cc6a · b29cc6a
1 parent c94a684
commit b29cc6a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php
@@ -542,10 +542,11 @@ protected static function _array(array $var, $depth, $indent) {
 
 		if ($depth >= 0) {
 			foreach ($var as $key => $val) {
-				if ($val != $var) {
-					$val = self::_export($val, $depth, $indent);
-				} else {
+				// Sniff for globals as !== explodes in < 5.4
+				if ($key === 'GLOBALS' && is_array($val) && isset($val['GLOBALS'])) {
 					$val = '[recursion]';
+				} else if ($val !== $var) {
+					$val = self::_export($val, $depth, $indent);
 				}
 				$vars[] = $break . self::exportVar($key) .
 					' => ' .