From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Tue, 7 Nov 2017 17:45:17 +0000 (+0100)
Subject: Fix mergeMessageFileList.php --extensions-dir extensions:skins
X-Git-Tag: 1.31.0-rc.0~1584^2
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=96effdf8f350e2dc928b9fcf931538235217b42f;p=lhc%2Fweb%2Fwiklou.git

Fix mergeMessageFileList.php --extensions-dir extensions:skins

Only last directory of multiple was being used.

Follows up e74bc3b32effac7e0bbf9e314f4a6f15eedf7bff

Change-Id: I30190a30c387f1c34a41f9bbc033d421be631756
---

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index bb47631357..8d2534eec5 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -80,29 +80,29 @@ class MergeMessageFileList extends Maintenance {
 			$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;
-				}
-				$possibilities = [
-					"$extdir/$extname/extension.json",
-					"$extdir/$extname/skin.json",
-					"$extdir/$extname/$extname.php"
-				];
-				$found = false;
-				foreach ( $possibilities as $extfile ) {
-					if ( file_exists( $extfile ) ) {
-						$mmfl['setupFiles'][] = $extfile;
-						$found = true;
-						break;
+				$entries = scandir( $extdir );
+				foreach ( $entries as $extname ) {
+					if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) {
+						continue;
+					}
+					$possibilities = [
+						"$extdir/$extname/extension.json",
+						"$extdir/$extname/skin.json",
+						"$extdir/$extname/$extname.php"
+					];
+					$found = false;
+					foreach ( $possibilities as $extfile ) {
+						if ( file_exists( $extfile ) ) {
+							$mmfl['setupFiles'][] = $extfile;
+							$found = true;
+							break;
+						}
 					}
-				}
 
-				if ( !$found ) {
-					$this->error( "Extension {$extname} in {$extdir} lacks expected entry point: " .
-						"extension.json, skin.json, or {$extname}.php." );
+					if ( !$found ) {
+						$this->error( "Extension {$extname} in {$extdir} lacks expected entry point: " .
+							"extension.json, skin.json, or {$extname}.php." );
+					}
 				}
 			}
 		}