From 1d8d173ecc1741bacaa1ac86227ae321e87f6dd0 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Fri, 18 Sep 2009 05:23:10 +0000 Subject: [PATCH] Assorted tweaks. --- maintenance/mergeMessageFileList.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php index dd78a04f1f..b781e57ffa 100644 --- a/maintenance/mergeMessageFileList.php +++ b/maintenance/mergeMessageFileList.php @@ -40,11 +40,25 @@ foreach ( $mmfl['setupFiles'] as $fileName ) { include_once( $fileName ); } fwrite( STDERR, "\n" ); -$s = '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" . +$s = + "<" . "?php\n" . + "## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" . + '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" . '$wgExtensionAliasesFiles = ' . var_export( $wgExtensionAliasesFiles, true ) . ";\n"; -$s = preg_replace( "/'" . preg_quote( $IP, '/' ) . "([^']*)'/", - '"$IP/\1"', $s ); +$dirs = array( + $IP, + dirname( dirname( __FILE__ ) ), + realpath( $IP ) +); + +foreach ( $dirs as $dir ) { + $s = preg_replace( + "/'" . preg_quote( $dir, '/' ) . "([^']*)'/", + '"$IP\1"', + $s ); +} + if ( isset( $mmfl['output'] ) ) { file_put_contents( $mmfl['output'], $s ); } else { -- 2.20.1