\n to eof

[lhc/web/wiklou.git] / maintenance / mergeMessageFileList.php

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index b781e57..b1b5773 100644 (file)
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -1,6 +1,9 @@
 <?php
 
-require_once( dirname( __FILE__ ).'/Maintenance.php' );
+# Start from scratch
+define( 'MW_NO_EXTENSION_MESSAGES', 1 );
+
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 $maintClass = 'MergeMessageFileList';
 $mmfl = false;
 class MergeMessageFileList extends Maintenance {
@@ -8,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;
@@ -37,25 +40,27 @@ 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" . 
+$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";
 
 $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 );
 }