From 0e33114d4d316dfb36b2272a7509313bdc292ef8 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Wed, 5 Oct 2011 12:05:40 +0000
Subject: [PATCH] // Improve exception display

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9051 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/exception/PrestashopException.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/exception/PrestashopException.php b/classes/exception/PrestashopException.php
index 057b5496a..3fd135d37 100644
--- a/classes/exception/PrestashopException.php
+++ b/classes/exception/PrestashopException.php
@@ -58,6 +58,8 @@ class PrestashopExceptionCore extends Exception
 				ltrim(str_replace(array(_PS_ROOT_DIR_, '\\'), array('', '/'), $this->getFile()), '/')
 			);
 
+			$this->displayFileDebug($this->getFile(), $this->getLine());
+
 			// Display debug backtrace
 			echo '<ul>';
 			foreach ($this->getTrace() as $id => $trace)
@@ -96,7 +98,7 @@ class PrestashopExceptionCore extends Exception
 	 * @param int $line
 	 * @param string $id
 	 */
-	protected function displayFileDebug($file, $line, $id)
+	protected function displayFileDebug($file, $line, $id = null)
 	{
 		$lines = file($file);
 		$offset = $line - 6;
@@ -108,7 +110,7 @@ class PrestashopExceptionCore extends Exception
 		}
 		$lines = array_slice($lines, $offset, $total);
 
-		echo '<div class="psTrace" id="psTrace_'.$id.'"><pre>';
+		echo '<div class="psTrace" id="psTrace_'.$id.'" '.((is_null($id) ? 'style="display: block"' : '')).'><pre>';
 		foreach ($lines as $k => $l)
 		{
 			if ($offset + $k == $line - 1)