update to MediaWiki 1.16.0

1 files changed, 46 insertions, 23 deletions

diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php
index 42380eea..69cb0f56 100644
--- a/maintenance/patchSql.php
+++ b/maintenance/patchSql.php
@@ -3,34 +3,57 @@
  * Manually run an SQL patch outside of the general updaters.
  * This ensures that the DB options (charset, prefix, engine) are correctly set.
  *
- * @file
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance
  */
 
-require_once 'commandLine.inc';
-require_once "$IP/maintenance/updaters.inc";
+require_once( dirname(__FILE__) . '/Maintenance.php' );
+
+class PatchSql extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Run an SQL file into the DB, replacing prefix and charset vars";
+		$this->addArg( 'patch-name', 'Name of the patch file, either full path or in maintenance/archives' );
+	}
+
+	public function getDbType() {
+		return Maintenance::DB_ADMIN;
+	}
 
-if( $args ) {
-	foreach( $args as $arg ) {
-		$files = array(
-			$arg,
-			archive( $arg ),
-			archive( "patch-$arg.sql" ),
-		);
-		foreach( $files as $file ) {
-			if( file_exists( $file ) ) {
-				echo "$file ...\n";
-				dbsource( $file );
-				continue 2;
+	public function execute() {
+		$dbw = wfGetDB( DB_MASTER );
+		foreach( $this->mArgs as $arg ) {
+			$files = array(
+				$arg,
+				DatabaseBase::patchPath( $arg ),
+				DatabaseBase::patchPath( "patch-$arg.sql" ),
+			);
+			foreach( $files as $file ) {
+				if( file_exists( $file ) ) {
+					$this->output( "$file ...\n" );
+					$dbw->sourceFile( $file );
+					continue 2;
+				}
 			}
+			$this->error( "Could not find $arg\n" );
 		}
-		echo "Could not find $arg\n";
+		$this->output( "done.\n" );
 	}
-	echo "done.\n";
-} else {
-	echo "Run an SQL file into the DB, replacing prefix and charset vars.\n";
-	echo "Usage:\n";
-	echo "  php maintenance/patchSql.php file1.sql file2.sql ...\n";
-	echo "\n";
-	echo "Paths in maintenance/archive are automatically expanded if a local file isn't found.\n";
 }
+
+$maintClass = "PatchSql";
+require_once( DO_MAINTENANCE );