Revert r52336 "Merge maintenance-work branch:"

[lhc/web/wiklou.git] / maintenance / sql.php

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 38c995a..ab6546b 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -53,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";
        }
 }