Index: branches/wmf-deployment/maintenance/mergeMessageFileList.php |
— | — | @@ -1,5 +1,8 @@ |
2 | 2 | <?php |
3 | 3 | |
| 4 | +# Start from scratch |
| 5 | +define( 'MW_NO_EXTENSION_MESSAGES', 1 ); |
| 6 | + |
4 | 7 | require_once( dirname( __FILE__ ).'/Maintenance.php' ); |
5 | 8 | $maintClass = 'MergeMessageFileList'; |
6 | 9 | $mmfl = false; |
— | — | @@ -37,12 +40,14 @@ |
38 | 41 | continue; |
39 | 42 | } |
40 | 43 | $fileName = str_replace( '$IP', $IP, $fileName ); |
| 44 | + fwrite( STDERR, "Loading data from $fileName\n" ); |
41 | 45 | include_once( $fileName ); |
42 | 46 | } |
43 | 47 | fwrite( STDERR, "\n" ); |
44 | 48 | $s = |
45 | 49 | "<" . "?php\n" . |
46 | 50 | "## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" . |
| 51 | + "if ( defined( 'MW_NO_EXTENSION_MESSAGES' ) ) return;\n\n" . |
47 | 52 | '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" . |
48 | 53 | '$wgExtensionAliasesFiles = ' . var_export( $wgExtensionAliasesFiles, true ) . ";\n"; |
49 | 54 | |
Property changes on: branches/wmf-deployment/maintenance/mergeMessageFileList.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
50 | 55 | - /branches/REL1_15/phase3/maintenance/mergeMessageFileList.php:51646 |
/trunk/phase3/maintenance/mergeMessageFileList.php:56862,56867,57154-57447,57541,57916,58151,58219,58633,58816 |
51 | 56 | + /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 |
52 | 57 | - /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 |
53 | 58 | + /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 |