From e74bc3b32effac7e0bbf9e314f4a6f15eedf7bff Mon Sep 17 00:00:00 2001 From: Mukunda Modell Date: Wed, 3 Feb 2016 19:06:02 -0600 Subject: [PATCH] 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 --- maintenance/mergeMessageFileList.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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; -- 2.20.1