From b29cc6a9b64e7d17d5ef7def30dc3f774328c70a Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 8 Aug 2012 23:09:44 -0400 Subject: [PATCH] Try again at fixing errors in 5.2 --- lib/Cake/Utility/Debugger.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php index 2683bac26..514b16d9e 100644 --- a/lib/Cake/Utility/Debugger.php +++ b/lib/Cake/Utility/Debugger.php @@ -542,10 +542,11 @@ class Debugger { 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) . ' => ' .