Index: trunk/kernel/include/adodb/adodb.inc.php
===================================================================
diff -u -r662 -r842
--- trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 662)
+++ trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 842)
@@ -702,7 +702,7 @@
 		}
 		// debug version of query
 		if ($this->debug) {
-		global $HTTP_SERVER_VARS;
+			global $HTTP_SERVER_VARS, $debugger;
 		
 			$ss = '';
 			if ($inputarr) {
@@ -744,16 +744,13 @@
 					$e = $this->ErrorNo();
 					$m = $this->ErrorMsg();
 
-if(defined('SQL_ERROR_DIE')&&SQL_ERROR_DIE)
-{
-	echo '<pre><b style="color:red;">'.$sql.'<br>Error #'.$e.': '.$m.'</b><br>';
-	echo '<b>Request</b><br>';
-	print_r($_REQUEST);
-	echo '<b>Back Trace</b><br>';
-	print_r(debug_backtrace());
-	echo '</pre>';
-	exit;
-}
+					if(defined('SQL_ERROR_DIE')&&SQL_ERROR_DIE)
+					{
+						$debugger->dumpVars($_REQUEST);
+						$debugger->appendTrace();
+						trigger_error('<span class="debug_error">'.$m.' ('.$e.')</span><br><a href="javascript:SetClipboard(\''.addslashes($sql).'\');"><b>SQL</b></a>: '.$sql, E_USER_ERROR);
+					}
+					
 					ADOConnection::outp($e .': '. $m );
 					flush();
 				}