From b9dd9190f270bc021d44ea3c9512147600595e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Thu, 19 Jun 2014 18:05:58 +0200
Subject: [PATCH] improved trace step skipping

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

diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php
index dd8ba74f..ee01f9aa 100644
--- a/application/core/ErrorHandler.php
+++ b/application/core/ErrorHandler.php
@@ -258,9 +258,17 @@ class ErrorHandler {
 	 */
 	private function shouldSkipTraceStep(array $traceStep) {
 		if (isset($traceStep['class'])) {
-			$skippedClasses = array('Symfony', 'cURL');
+			$skippedClasses = array('Symfony\\Component\\EventDispatcher\\EventDispatcher', 'cURL\\Request');
 			foreach ($skippedClasses as $skippedClass) {
-				if (strpos($traceStep['class'], $skippedClass) !== false) {
+				if ($traceStep['class'] === $skippedClass) {
+					return true;
+				}
+			}
+		}
+		if (isset($traceStep['file'])) {
+			$skippedFiles = array('Symfony', 'curl-easy');
+			foreach ($skippedFiles as $skippedFile) {
+				if (strpos($traceStep['file'], $skippedFile)) {
 					return true;
 				}
 			}