From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 27 Nov 2009 00:18:59 +0000 (+0000)
Subject: Don't include the old ExtensionMessages.php when you're building a new one. Otherwise... 
X-Git-Tag: 1.31.0-rc.0~38702
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=0956ad88ed0372aa8bd0a680798a192673362ef3;p=lhc%2Fweb%2Fwiklou.git

Don't include the old ExtensionMessages.php when you're building a new one. Otherwise renames break.
---

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index b781e57ffa..57d9ebb037 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -1,5 +1,8 @@
 <?php
 
+# Start from scratch
+define( 'MW_NO_EXTENSION_MESSAGES', 1 );
+
 require_once( dirname( __FILE__ ).'/Maintenance.php' );
 $maintClass = 'MergeMessageFileList';
 $mmfl = false;
@@ -37,12 +40,14 @@ foreach ( $mmfl['setupFiles'] as $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" .
 	'$wgExtensionAliasesFiles = ' . var_export( $wgExtensionAliasesFiles, true ) . ";\n";