From: Mukunda Modell <mmodell@wikimedia.org>
Date: Thu, 4 Feb 2016 01:06:02 +0000 (-0600)
Subject: Support multiple extension-dir paths to be passed to mergeMessageFileList
X-Git-Tag: 1.31.0-rc.0~7593^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=e74bc3b32effac7e0bbf9e314f4a6f15eedf7bff;p=lhc%2Fweb%2Fwiklou.git

Support multiple extension-dir paths to be passed to mergeMessageFileList

If scap is modified to pass the path to both extensions/ and skins/ then
the extension-list file in wmf-config will no longer be needed, eliminating
many headaches. (refs T125678)

Bug: T125678

Change-Id: I4fd0c99d68fa32bf2378691955850a1be2c022df
---

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 46d5474478..a650aa0b0e 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -81,7 +81,12 @@ class MergeMessageFileList extends Maintenance {
 		# Now find out files in a directory
 		if ( $this->hasOption( 'extensions-dir' ) ) {
 			$extdir = $this->getOption( 'extensions-dir' );
-			$entries = scandir( $extdir );
+			# Allow multiple directories to be passed with ":" as delimiter
+			$extdirs = explode( ':', $extdir );
+			$entries = [];
+			foreach ( $extdirs as $extdir ) {
+				$entries = array_merge( $entries, scandir( $extdir ) );
+			}
 			foreach ( $entries as $extname ) {
 				if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) {
 					continue;