tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Removed switch in MySQLDatabase->query() to directly echo queries with 'showqueries' parameter when request is called via ajax

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114782 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-12-09 23:26:22 +00:00
parent 43debfafe9
commit ae2311bcd6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/model/MySQLDatabase.php
View File

@ -117,8 +117,7 @@ class MySQLDatabase extends SS_Database {
if(isset($_REQUEST['showqueries'])) { if(isset($_REQUEST['showqueries'])) {
$endtime = round(microtime(true) - $starttime,4); $endtime = round(microtime(true) - $starttime,4);
if (!isset($_REQUEST['ajax'])) Debug::message("\n$sql\n{$endtime}ms\n", false); 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); if(!$handle && $errorLevel) $this->databaseError("Couldn't run query: $sql | " . mysql_error($this->dbConn), $errorLevel);