Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 17 insertions, 6 deletions

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index e9183377..2a6f8a8b 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -43,15 +43,23 @@ class MergeMessageFileList extends Maintenance {
 
 	function __construct() {
 		parent::__construct();
-		$this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', false, true );
+		$this->addOption(
+			'list-file',
+			'A file containing a list of extension setup files, one per line.',
+			false,
+			true
+		);
 		$this->addOption( 'extensions-dir', 'Path where extensions can be found.', 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 ' .
-			'single array containing all message files.';
+		$this->mDescription = 'Merge $wgExtensionMessagesFiles and $wgMessagesDirs from ' .
+			' various extensions to produce a single file listing all message files and dirs.';
 	}
 
 	public function execute() {
-		global $mmfl, $wgExtensionEntryPointListFiles;
+		// @codingStandardsIgnoreStart Ignore error: Global variable "$mmfl" is lacking 'wg' prefix
+		global $mmfl;
+		// @codingStandardsIgnoreEnd
+		global $wgExtensionEntryPointListFiles;
 
 		if ( !count( $wgExtensionEntryPointListFiles )
 			&& !$this->hasOption( 'list-file' )
@@ -117,6 +125,7 @@ class MergeMessageFileList extends Maintenance {
 		if ( $fileLines === false ) {
 			$this->hasError = true;
 			$this->error( "Unable to open list file $fileName." );
+
 			return $files;
 		}
 		# Strip comments, discard empty lines, and trim leading and trailing
@@ -134,6 +143,7 @@ class MergeMessageFileList extends Maintenance {
 				}
 			}
 		}
+
 		return $files;
 	}
 }
@@ -148,7 +158,7 @@ foreach ( $mmfl['setupFiles'] as $fileName ) {
 		fwrite( STDERR, "Loading data from $fileName\n" );
 	}
 	// Include the extension to update $wgExtensionMessagesFiles
-	if ( !( include_once( $fileName ) ) ) {
+	if ( !( include_once $fileName ) ) {
 		fwrite( STDERR, "Unable to read $fileName\n" );
 		exit( 1 );
 	}
@@ -158,7 +168,8 @@ $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";
+	'$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" .
+	'$wgMessagesDirs = ' . var_export( $wgMessagesDirs, true ) . ";\n\n";
 
 $dirs = array(
 	$IP,