X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=b749da422b0abd90294bafb4f000239b6f00ca85;hb=0addbfb645f4752e275b309e179bd0db0f9aa5ca;hp=bb4763135724ba8bb2b501371de8ba3da4a16fbd;hpb=dfaa26a7b19ab65190a76cd32259a3637cc3e2fd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index bb47631357..b749da422b 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -61,8 +61,8 @@ class MergeMessageFileList extends Maintenance {
 			&& !$this->hasOption( 'list-file' )
 			&& !$this->hasOption( 'extensions-dir' )
 		) {
-			$this->error( "Either --list-file or --extensions-dir must be provided if " .
-				"\$wgExtensionEntryPointListFiles is not set", 1 );
+			$this->fatalError( "Either --list-file or --extensions-dir must be provided if " .
+				"\$wgExtensionEntryPointListFiles is not set" );
 		}
 
 		$mmfl = [ 'setupFiles' => [] ];
@@ -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." );
+					}
 				}
 			}
 		}