r59479 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r59478‎ | r59479 | r59480 >
Date:00:24, 27 November 2009
Author:tstarling
Status:deferred
Tags:
Comment:
Merged r59478, mergeMessageFileList.php extension rename fix
Modified paths:
  • /branches/wmf-deployment/maintenance (modified) (history)
  • /branches/wmf-deployment/maintenance/mergeMessageFileList.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/maintenance/mergeMessageFileList.php
@@ -1,5 +1,8 @@
22 <?php
33
 4+# Start from scratch
 5+define( 'MW_NO_EXTENSION_MESSAGES', 1 );
 6+
47 require_once( dirname( __FILE__ ).'/Maintenance.php' );
58 $maintClass = 'MergeMessageFileList';
69 $mmfl = false;
@@ -37,12 +40,14 @@
3841 continue;
3942 }
4043 $fileName = str_replace( '$IP', $IP, $fileName );
 44+ fwrite( STDERR, "Loading data from $fileName\n" );
4145 include_once( $fileName );
4246 }
4347 fwrite( STDERR, "\n" );
4448 $s =
4549 "<" . "?php\n" .
4650 "## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" .
 51+ "if ( defined( 'MW_NO_EXTENSION_MESSAGES' ) ) return;\n\n" .
4752 '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .
4853 '$wgExtensionAliasesFiles = ' . var_export( $wgExtensionAliasesFiles, true ) . ";\n";
4954
Property changes on: branches/wmf-deployment/maintenance/mergeMessageFileList.php
___________________________________________________________________
Name: svn:mergeinfo
5055 - /branches/REL1_15/phase3/maintenance/mergeMessageFileList.php:51646
/trunk/phase3/maintenance/mergeMessageFileList.php:56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
5156 + /branches/REL1_15/phase3/maintenance/mergeMessageFileList.php:51646
/trunk/phase3/maintenance/mergeMessageFileList.php:56862,56867,57154-57447,57541,57916,58151,58219,58633,58816,59478
Property changes on: branches/wmf-deployment/maintenance
___________________________________________________________________
Name: svn:mergeinfo
5257 - /branches/REL1_15/phase3/maintenance:51646
/trunk/phase3/maintenance:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816
5358 + /branches/REL1_15/phase3/maintenance:51646
/trunk/phase3/maintenance:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,56862,56867,57154-57447,57541,57916,58151,58219,58633,58816,59478

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r59478Don't include the old ExtensionMessages.php when you're building a new one. O...tstarling00:18, 27 November 2009

Status & tagging log