Fixed some errors while running patchSql.php:

* Notice: Undefined variable: name in includes/db/Database.php on lines 2209 and 2212
* Fatal error: Call to undefined method DatabaseMysql::fileSource() in maintenance/patchSql.php on line 48

diff --git a/includes/db/Database.php b/includes/db/Database.php
index e198eab..c997544 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2182,10 +2182,10 @@ abstract class DatabaseBase {
         */
        public static function patchPath( $patch ) {
                global $wgDBtype, $IP;
-               if ( file_exists( "$IP/maintenance/$wgDBtype/archives/$name" ) ) {
-                       return "$IP/maintenance/$wgDBtype/archives/$name";
+               if ( file_exists( "$IP/maintenance/$wgDBtype/archives/$patch" ) ) {
+                       return "$IP/maintenance/$wgDBtype/archives/$patch";
                } else {
-                       return "$IP/maintenance/archives/$name";
+                       return "$IP/maintenance/archives/$patch";
                }
        }
 

diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php
index 0aee36f..69cb0f5 100644 (file)
--- a/maintenance/patchSql.php
+++ b/maintenance/patchSql.php
@@ -45,7 +45,7 @@ class PatchSql extends Maintenance {
                        foreach( $files as $file ) {
                                if( file_exists( $file ) ) {
                                        $this->output( "$file ...\n" );
-                                       $dbw->fileSource( $file );
+                                       $dbw->sourceFile( $file );
                                        continue 2;
                                }
                        }