Index: branches/RC/core/kernel/utility/debugger.php =================================================================== diff -u -r10713 -r10771 --- branches/RC/core/kernel/utility/debugger.php (.../debugger.php) (revision 10713) +++ branches/RC/core/kernel/utility/debugger.php (.../debugger.php) (revision 10771) @@ -596,6 +596,7 @@ { $sql = trim( preg_replace('/(\n|\t| )+/is', ' ', $sql) ); + // whitespace in the beginning of the regex is to avoid splitting inside words, for exmaple "FROM int_ConfigurationValues" into "FROM intConfiguration\n\tValues" $formatted_sql = preg_replace('/\s(CREATE TABLE|DROP TABLE|SELECT|UPDATE|SET|REPLACE|INSERT|DELETE|VALUES|FROM|LEFT JOIN|INNER JOIN|LIMIT|WHERE|HAVING|GROUP BY|ORDER BY)\s/is', "\n\t$1 ", ' ' . $sql); $formatted_sql = $this->highlightString($formatted_sql); @@ -1007,7 +1008,7 @@ } $this->profileFinish('script_runtime'); - $this->breakOutofBuffering(); + $this->breakOutofBuffering(!$returnResult); $debugger_start = memory_get_usage();