From e7b2e7ec92c2221439df1719ab1c946e65ce14a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Thu, 20 Mar 2014 16:19:30 +0100
Subject: [PATCH] don't output backtrace for user errors

---
 application/core/ErrorHandler.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php
index b4ab9fa4..8e18ca9e 100644
--- a/application/core/ErrorHandler.php
+++ b/application/core/ErrorHandler.php
@@ -102,13 +102,16 @@ class ErrorHandler {
 			return false;
 		}
 		
+		$userError = ($errorNumber == E_USER_ERROR || $errorNumber == E_USER_WARNING || $errorNumber == E_USER_NOTICE ||
+				 $errorNumber == E_USER_DEPRECATED);
+		
 		// Log error
 		$errorTag = $this->getErrorTag($errorNumber);
 		$message = $errorTag . ': ' . $errorString;
 		$traceMessage = $this->parseBackTrace(debug_backtrace());
-		logMessage($message . PHP_EOL . $traceMessage);
+		logMessage($message . ($userError ? '' : PHP_EOL . $traceMessage));
 		
-		if ($this->reportErrors && $errorNumber != E_USER_ERROR && $errorNumber != E_USER_WARNING && $errorNumber != E_USER_NOTICE) {
+		if ($this->reportErrors && !$userError) {
 			$error = array();
 			$error["Type"] = "Error";
 			$error["Message"] = $message;