Index: trunk/core/kernel/application.php
===================================================================
diff -u -r951 -r961
--- trunk/core/kernel/application.php	(.../application.php)	(revision 951)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 961)
@@ -815,7 +815,11 @@
 			$errorLevel=defined('DBG_SQL_FAILURE')&&DBG_SQL_FAILURE?E_USER_ERROR:E_USER_WARNING;
 			$debugger->dumpVars($_REQUEST);
 			$debugger->appendTrace();
-			trigger_error('<span class="debug_error">'.$msg.' ('.$code.')</span><br><a href="javascript:SetClipboard(\''.addslashes($sql).'\');"><b>SQL</b></a>: '.$debugger->highlightString($sql),$errorLevel);
+			
+			$error_msg = '<span class="debug_error">'.$msg.' ('.$code.')</span><br><a href="javascript:SetClipboard(\''.htmlspecialchars($sql).'\');"><b>SQL</b></a>: '.$debugger->formatSQL($sql);
+			$long_id=$debugger->mapLongError($error_msg);
+			trigger_error($msg.' ('.$code.') ['.$sql.'] #'.$long_id, $errorLevel);
+			
 			return true;
 		}
 		else