From 1e2840cd3139a2d0b2cb1afad763a20b0416d48d Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 14 Mar 2010 15:48:29 +0000 Subject: [PATCH] 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 --- includes/db/Database.php | 6 +++--- maintenance/patchSql.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index e198eab2c5..c997544644 100644 --- 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 0aee36f6da..69cb0f56b6 100644 --- 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; } } -- 2.20.1