//Merge branch release

2013-01-02 09:56:20 +01:00
parent 2420fff747 a82cb7a8f4
commit a4eb2cc7a9
475 changed files with 23768 additions and 22253 deletions
@@ -51,7 +51,12 @@ class PrestaShopExceptionCore extends Exception
 			</style>';
 			echo '<div id="psException">';
 			echo '<h2>['.get_class($this).']</h2>';
-			echo $this->getExentedMessage();
+			printf(
+				'<p><b>%s</b><br /><i>at line </i><b>%d</b><i> in file </i><b>%s</b></p>',
+				Tools::safeOutput($this->getMessage()),
+				$this->getLine(),
+				ltrim(str_replace(array(_PS_ROOT_DIR_, '\\'), array('', '/'), $this->getFile()), '/')
+			);

 			$this->displayFileDebug($this->getFile(), $this->getLine());