Include function name for SQL statements dumped to debug log

diff --git a/includes/Database.php b/includes/Database.php
index 2364551..64004f6 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -274,17 +274,17 @@ class Database {
                
                $this->mLastQuery = $sql;
                
-               if ( $this->debug() ) {
-                       $sqlx = substr( $sql, 0, 500 );
-                       $sqlx = wordwrap(strtr($sqlx,"\t\n",'  '));
-                       wfDebug( "SQL: $sqlx\n" );
-               }
                # Add a comment for easy SHOW PROCESSLIST interpretation
                if ( $fname ) {
                        $commentedSql = "/* $fname */ $sql";
                } else {
                        $commentedSql = $sql;
                }
+               if ( $this->debug() ) {
+                       $sqlx = substr( $commentedSql, 0, 500 );
+                       $sqlx = wordwrap(strtr($sqlx,"\t\n",'  '));
+                       wfDebug( "SQL: $sqlx\n" );
+               }
                
                # If DBO_TRX is set, start a transaction
                if ( ( $this->mFlags & DBO_TRX ) && !$this->trxLevel() && $sql != 'BEGIN' ) {