From ae2311bcd61b0a052032e265487f956508cf92c7 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 9 Dec 2010 23:26:22 +0000 Subject: [PATCH] BUGFIX Removed switch in MySQLDatabase->query() to directly echo queries with 'showqueries' parameter when request is called via ajax git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114782 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/MySQLDatabase.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/model/MySQLDatabase.php b/core/model/MySQLDatabase.php index 5d7a19f6ed1..53b699b30d0 100755 --- a/core/model/MySQLDatabase.php +++ b/core/model/MySQLDatabase.php @@ -117,8 +117,7 @@ public function query($sql, $errorLevel = E_USER_ERROR) { if(isset($_REQUEST['showqueries'])) { $endtime = round(microtime(true) - $starttime,4); - if (!isset($_REQUEST['ajax'])) Debug::message("\n$sql\n{$endtime}ms\n", false); - else echo "\n$sql\n{$endtime}ms\n"; + Debug::message("\n$sql\n{$endtime}ms\n", false); } if(!$handle && $errorLevel) $this->databaseError("Couldn't run query: $sql | " . mysql_error($this->dbConn), $errorLevel);