From aac762c45273f0f628b9ba372aea76f42f5c440e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Tue, 6 May 2014 02:29:48 +0200 Subject: [PATCH] readded ignoring in error handling --- application/core/ErrorHandler.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php index 02826a8d..ffa72d26 100644 --- a/application/core/ErrorHandler.php +++ b/application/core/ErrorHandler.php @@ -61,6 +61,7 @@ class ErrorHandler { $error['Type'] = 'Exception'; $error['Message'] = $message; $error['Class'] = $exceptionClass; + $error['FileLine'] = $ex->getFile() . ': ' . $ex->getLine(); $error['Backtrace'] = $traceString; $error['OperatingSystem'] = php_uname(); $error['PHPVersion'] = phpversion(); @@ -129,6 +130,12 @@ class ErrorHandler { * @return bool */ public function handleError($errorNumber, $errorString, $errorFile = null, $errorLine = -1) { + $userError = $this->isUserErrorNumber($errorNumber); + + if (!$userError && error_reporting() === 0) { + return; + } + $errorTag = $this->getErrorTag($errorNumber); $message = $errorTag . ': ' . $errorString; @@ -138,7 +145,7 @@ class ErrorHandler { $logMessage = $message . PHP_EOL . 'File&Line: ' . $fileLine . PHP_EOL . 'Trace: ' . $traceString; logMessage($logMessage); - if ($this->reportErrors && !$this->isUserErrorNumber($errorNumber)) { + if ($this->reportErrors && !$userError) { $error = array(); $error['Type'] = 'Error'; $error['Message'] = $message;