From 66db4c486d039cb1ad370ab3f0f460ec9ea4be89 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Wed, 5 Oct 2011 14:43:25 +0000
Subject: [PATCH] // Small fix on exceptions

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9064 b9a71923-0436-4b27-9f14-aed3839534dd
---
 cache/class_index.php                     | 2 ++
 classes/exception/PrestashopException.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cache/class_index.php b/cache/class_index.php
index a3c484bbc..d3746a81d 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -300,6 +300,8 @@
   'AdminHomeController' => 'override/controllers/admin/AdminHomeController.php',
   'AdminRequestSqlControllerCore' => 'controllers/admin/AdminRequestSqlController.php',
   'AdminRequestSqlController' => '',
+  'AdminShopUrlControllerCore' => 'controllers/admin/AdminShopUrlController.php',
+  'AdminShopUrlController' => '',
   'AdminToolsControllerCore' => 'controllers/admin/AdminToolsController.php',
   'AdminToolsController' => 'override/controllers/admin/AdminToolsController.php',
   'AdminTrackingController' => 'controllers/admin/AdminTrackingController.php',
diff --git a/classes/exception/PrestashopException.php b/classes/exception/PrestashopException.php
index 3fd135d37..c6bd69180 100644
--- a/classes/exception/PrestashopException.php
+++ b/classes/exception/PrestashopException.php
@@ -67,7 +67,7 @@ class PrestashopExceptionCore extends Exception
 				$relative_file = ltrim(str_replace(array(_PS_ROOT_DIR_, '\\'), array('', '/'), $trace['file']), '/');
 
 				echo '<li>';
-				echo '<b>'.$trace['class'].$trace['type'].$trace['function'].'</b>';
+				echo '<b>'.((isset($trace['class'])) ? $trace['class'] : '').((isset($trace['type'])) ? $trace['type'] : '').$trace['function'].'</b>';
 				echo ' - <a href="#" style="font-size: 12px; color: #000000" onclick="document.getElementById(\'psTrace_'.$id.'\').style.display = (document.getElementById(\'psTrace_'.$id.'\').style.display != \'block\') ? \'block\' : \'none\'; return false">[line '.$trace['line'].' - '.$relative_file.']</a>';
 
 				if (count($trace['args']))