From: Catrope <roan.kattouw@gmail.com>
Date: Fri, 13 Apr 2012 00:18:43 +0000 (-0700)
Subject: Revert "Bit more refactoring"
X-Git-Tag: 1.31.0-rc.0~23920^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=d242205f7293858ba49c6d682f253484c90ba52d;p=lhc%2Fweb%2Fwiklou.git

Revert "Bit more refactoring"

This reverts commit 5586e73fac6f70d7b16bc5a4d185d35f80ff53b5.

This broke mergeMessageFileList.php by no longer running the extension
setup files in the global scope.

Change-Id: I8f22d0b3e938ba617f4297802edfc2012d78cc9b
---

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index b5a911aac3..d187dbe075 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -26,7 +26,8 @@
 define( 'MW_NO_EXTENSION_MESSAGES', 1 );
 
 require_once( dirname( __FILE__ ) . '/Maintenance.php' );
-
+$maintClass = 'MergeMessageFileList';
+$mmfl = false;
 class MergeMessageFileList extends Maintenance {
 
 	function __construct() {
@@ -38,6 +39,8 @@ class MergeMessageFileList extends Maintenance {
 	}
 
 	public function execute() {
+		global $mmfl;
+
 		$lines = file( $this->getOption( 'list-file' ) );
 		if ( $lines === false ) {
 			$this->error( 'Unable to open list file.' );
@@ -46,43 +49,42 @@ class MergeMessageFileList extends Maintenance {
 		if ( $this->hasOption( 'output' ) ) {
 			$mmfl['output'] = $this->getOption( 'output' );
 		}
+	}
+}
 
-		global $IP, $wgExtensionMessagesFiles;
-		foreach ( $mmfl['setupFiles'] as $fileName ) {
-			if ( strval( $fileName ) === '' ) {
-				continue;
-			}
-			$fileName = str_replace( '$IP', $IP, $fileName );
-			fwrite( STDERR, "Loading data from $fileName\n" );
-			include_once( $fileName );
-		}
-		fwrite( STDERR, "\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";
+require_once( RUN_MAINTENANCE_IF_MAIN );
+
+foreach ( $mmfl['setupFiles'] as $fileName ) {
+	if ( strval( $fileName ) === '' ) {
+		continue;
+	}
+	$fileName = str_replace( '$IP', $IP, $fileName );
+	fwrite( STDERR, "Loading data from $fileName\n" );
+	include_once( $fileName );
+}
+fwrite( STDERR, "\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" .
 
-		$dirs = array(
-			$IP,
-			dirname( dirname( __FILE__ ) ),
-			realpath( $IP )
-		);
+$dirs = array(
+	$IP,
+	dirname( dirname( __FILE__ ) ),
+	realpath( $IP )
+);
 
-		foreach ( $dirs as $dir ) {
-			$s = preg_replace(
-				"/'" . preg_quote( $dir, '/' ) . "([^']*)'/",
-				'"$IP\1"',
-				$s );
-		}
+foreach ( $dirs as $dir ) {
+	$s = preg_replace(
+		"/'" . preg_quote( $dir, '/' ) . "([^']*)'/",
+		'"$IP\1"',
+		$s );
+}
 
-		if ( isset( $mmfl['output'] ) ) {
-			file_put_contents( $mmfl['output'], $s );
-		} else {
-			echo $s;
-		}
-	}
+if ( isset( $mmfl['output'] ) ) {
+	file_put_contents( $mmfl['output'], $s );
+} else {
+	echo $s;
 }
 
-$maintClass = 'MergeMessageFileList';
-require_once( RUN_MAINTENANCE_IF_MAIN );