X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=b4914971ab78c9cb917d26b1de09afe718eb5fae;hb=b8caeb626cc6be0e2924cbee944acfa89ec59773;hp=2a6f8a8b7a74c43066da05835adebd7d131792bb;hpb=bd4484b72f323fed599ee99c53f2bef8ef881a0c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index 2a6f8a8b7a..b4914971ab 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -85,12 +85,24 @@ class MergeMessageFileList extends Maintenance {
 				if ( $extname == '.' || $extname == '..' || !is_dir( "$extdir/$extname" ) ) {
 					continue;
 				}
-				$extfile = "{$extdir}/{$extname}/{$extname}.php";
-				if ( file_exists( $extfile ) ) {
-					$mmfl['setupFiles'][] = $extfile;
-				} else {
+				$possibilities = array(
+					"$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->hasError = true;
-					$this->error( "Extension {$extname} in {$extdir} lacks expected {$extname}.php" );
+					$this->error( "Extension {$extname} in {$extdir} lacks expected entry point: " .
+						"extension.json, skin.json, or {$extname}.php." );
 				}
 			}
 		}
@@ -150,6 +162,7 @@ class MergeMessageFileList extends Maintenance {
 
 require_once RUN_MAINTENANCE_IF_MAIN;
 
+$queue = array();
 foreach ( $mmfl['setupFiles'] as $fileName ) {
 	if ( strval( $fileName ) === '' ) {
 		continue;
@@ -157,12 +170,24 @@ foreach ( $mmfl['setupFiles'] as $fileName ) {
 	if ( empty( $mmfl['quiet'] ) ) {
 		fwrite( STDERR, "Loading data from $fileName\n" );
 	}
-	// Include the extension to update $wgExtensionMessagesFiles
-	if ( !( include_once $fileName ) ) {
-		fwrite( STDERR, "Unable to read $fileName\n" );
-		exit( 1 );
+	// Using extension.json or skin.json
+	if ( substr( $fileName, -strlen( '.json' ) ) === '.json' ) {
+		$queue[$fileName] = 1;
+	} else {
+		require_once $fileName;
+	}
+}
+
+if ( $queue ) {
+	$registry = new ExtensionRegistry();
+	$data = $registry->readFromQueue( $queue );
+	foreach ( array( 'wgExtensionMessagesFiles', 'wgMessagesDirs' ) as $var ) {
+		if ( isset( $data['globals'][$var] ) ) {
+			$GLOBALS[$var] = array_merge( $data['globals'][$var], $GLOBALS[$var] );
+		}
 	}
 }
+
 fwrite( STDERR, "\n" );
 $s =
 	"<" . "?php\n" .