Index: trunk/kernel/include/adodb/adodb.inc.php
===================================================================
diff -u -r855 -r856
--- trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 855)
+++ trunk/kernel/include/adodb/adodb.inc.php	(.../adodb.inc.php)	(revision 856)
@@ -729,6 +729,7 @@
 				$isSkipTable = isSkipTable($sql);
 				$queryID = $debugger->generateID();
 				if(!$isSkipTable) $debugger->profileStart('sql_'.$queryID, $debugger->highlightString($sql) );
+				//$debugger->appendTrace();
 			}
 			$this->_queryID = $this->_query($sql,$inputarr,$arg3);
 			if($profileSQLs && !$isSkipTable) $debugger->profileFinish('sql_'.$queryID);
@@ -751,12 +752,10 @@
 					$e = $this->ErrorNo();
 					$m = $this->ErrorMsg();
 
-					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);
-					}
+					$errorLevel = defined('SQL_ERROR_DIE')&&SQL_ERROR_DIE ? E_USER_ERROR : E_USER_WARNING;
+					$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, $errorLevel);
 					
 					ADOConnection::outp($e .': '. $m );
 					flush();
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -r855 -r856
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 855)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 856)
@@ -51,10 +51,8 @@
 						$ret .= ' in <b>'.basename($traceRec['file']).'</b> on line <b>'.$traceRec['line'].'</b><br>';
 						
 						// ensure parameter value is not longer then 200 symbols
-						foreach ($traceRec['args'] as $argID => $argValue)
-						{
-							if( strlen($argValue) > 200 ) $traceRec['args'][$argID] = substr($argValue,0,50).' ...';	
-						}
+						$this->processTraceArguments($traceRec['args']);
+						
 						$args = $this->highlightString(print_r($traceRec['args'], true));
 						$ret .= '<div id="'.$argsID.'" style="display: none;">'.$args.'</div>';
 						
@@ -76,6 +74,22 @@
 			}
 		}
 		
+		function processTraceArguments(&$traceArgs)
+		{
+			foreach ($traceRec['args'] as $argID => $argValue)
+			{
+				if( is_array($argValue) )
+				{
+					$this->processTraceArguments($argValue);
+					$traceRec['args'][$argID] = $argValue;
+				}
+				else
+				{
+					if( strlen($argValue) > 200 ) $traceRec['args'][$argID] = htmlspecialchars(substr($argValue,0,50).' ...');
+				}
+			}
+		}
+		
 		function highlightString($string)
 		{
 			$string = highlight_string('<?php '.$string.'?>', true);