Index: trunk/core/kernel/utility/debugger.php =================================================================== diff -u -N -r4834 -r4835 --- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 4834) +++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 4835) @@ -309,7 +309,7 @@ ); foreach ($skip_classes as $class_name) { - if (strtolower(get_class($object)) == $class_name) { + if (strtolower(get_class($object)) == strtolower($class_name)) { return true; } } @@ -643,40 +643,19 @@ 'Fatal Error' => Array(E_USER_ERROR), 'Warning' => Array(E_WARNING, E_USER_WARNING), 'Notice' => Array(E_NOTICE, E_USER_NOTICE), - 'PHP5 Strict' => Array(E_STRICT), ); + if (defined('E_STRICT')) { + $error_map['PHP5 Strict'] = Array(E_STRICT); + } + foreach ($error_map as $error_name => $error_codes) { if (in_array($error_code, $error_codes)) { return $error_name; } } return ''; - - /*switch ($errorCode) { - case E_USER_ERROR: - return 'Fatal Error'; - break; - - case E_WARNING: - case E_USER_WARNING: - return 'Warning'; - break; - - case E_NOTICE: - case E_USER_NOTICE: - return 'Notice'; - break; - - case E_STRICT: - return 'PHP5 Strict'; - break; - - default: - return ''; - break; - }*/ } /** @@ -898,7 +877,7 @@ if (substr($errorType, 0, 5) == 'Fatal') { $this->breakOutofBuffering(false); $this->IsFatalError = true; - ob_flush(); + if (ob_get_level()) ob_flush(); if (!dbg_ConstOn('DBG_USE_SHUTDOWN_FUNC')) { $this->printReport(); }