update to MediaWiki 1.17.0

1 files changed, 9 insertions, 9 deletions

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 57d9ebb0..00c8cae5 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -3,7 +3,7 @@
 # Start from scratch
 define( 'MW_NO_EXTENSION_MESSAGES', 1 );
 
-require_once( dirname( __FILE__ ).'/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 $maintClass = 'MergeMessageFileList';
 $mmfl = false;
 class MergeMessageFileList extends Maintenance {
@@ -11,12 +11,12 @@ class MergeMessageFileList extends Maintenance {
 	function __construct() {
 		$this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', false, true );
 		$this->addOption( 'output', 'Send output to this file (omit for stdout)', false, true );
-		$this->mDescription = 'Merge $wgExtensionMessagesFiles from various extensions to produce a ' . 
+		$this->mDescription = 'Merge $wgExtensionMessagesFiles from various extensions to produce a ' .
 			'single array containing all message files.';
 	}
 
 	public function execute() {
-		global $IP, $mmfl;
+		global $mmfl;
 		if ( !$this->hasOption( 'list-file' ) ) {
 			$this->error( 'The --list-file option must be specified.' );
 			return;
@@ -33,7 +33,7 @@ class MergeMessageFileList extends Maintenance {
 	}
 }
 
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 
 foreach ( $mmfl['setupFiles'] as $fileName ) {
 	if ( strval( $fileName ) === '' ) {
@@ -44,8 +44,8 @@ foreach ( $mmfl['setupFiles'] as $fileName ) {
 	include_once( $fileName );
 }
 fwrite( STDERR, "\n" );
-$s = 
-	"<" . "?php\n" . 
+$s =
+	"<" . "?php\n" .
 	"## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" .
 	"if ( defined( 'MW_NO_EXTENSION_MESSAGES' ) ) return;\n\n" .
 	'$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .
@@ -53,14 +53,14 @@ $s =
 
 $dirs = array(
 	$IP,
-	dirname( dirname( __FILE__ ) ), 
+	dirname( dirname( __FILE__ ) ),
 	realpath( $IP )
 );
 
 foreach ( $dirs as $dir ) {
-	$s = preg_replace( 
+	$s = preg_replace(
 		"/'" . preg_quote( $dir, '/' ) . "([^']*)'/",
-		'"$IP\1"', 
+		'"$IP\1"',
 		$s );
 }