X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fsql.php;h=ab6546b9e08c428ecc958a41a4bffa488816c874;hb=ed28ea58c9dde6cb42dc1882ff89eea3f9c89f24;hp=02c6dbf35297b79daa2f984aeedfd9b260bb9488;hpb=a15c419b3d130248f2556b9d00643ba9666a4189;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 02c6dbf352..ab6546b9e0 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -1,8 +1,10 @@
 <?php
-
 /**
  * Send SQL queries from the specified file to the database, performing
  * variable replacement along the way.
+ *
+ * @file
+ * @ingroup Database Maintenance
  */
 
 require_once( dirname(__FILE__) . '/' . 'commandLine.inc' );
@@ -51,15 +53,15 @@ class SqlPromptPrinter {
 	}
 }
 
-function sqlPrintResult( $res ) {
+function sqlPrintResult( $res, $db ) {
 	if ( !$res ) {
 		// Do nothing
-	} elseif ( $res->numRows() ) {
+	} elseif ( is_object( $res ) && $res->numRows() ) {
 		while ( $row = $res->fetchObject() ) {
 			print_r( $row );
 		}
 	} else {
-		$affected = $res->db->affectedRows();
+		$affected = $db->affectedRows();
 		echo "Query OK, $affected row(s) affected\n";
 	}
 }