Test cases working with “make tap” but not just “phpunit” right now.

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

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index b781e57..57d9ebb 100644 (file)
--- 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";