From 1e20e55c687b4768e01aad1d8068466ae99261d9 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 13 Apr 2010 02:06:24 +0000 Subject: [PATCH] MINOR don't HTML-format queries from showqueries if this is an AJAX request. (from r95855) (from r98097) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102589 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/MySQLDatabase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/model/MySQLDatabase.php b/core/model/MySQLDatabase.php index dc360acc4..27ea83243 100755 --- a/core/model/MySQLDatabase.php +++ b/core/model/MySQLDatabase.php @@ -127,7 +127,8 @@ class MySQLDatabase extends SS_Database { if(isset($_REQUEST['showqueries'])) { $endtime = round(microtime(true) - $starttime,4); - Debug::message("\n$sql\n{$endtime}ms\n", false); + if (!isset($_REQUEST['ajax'])) Debug::message("\n$sql\n{$endtime}ms\n", false); + else echo "\n$sql\n{$endtime}ms\n"; } if(!$handle && $errorLevel) $this->databaseError("Couldn't run query: $sql | " . mysql_error($this->dbConn), $errorLevel);