X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmergeMessageFileList.php;h=2a6f8a8b7a74c43066da05835adebd7d131792bb;hb=25ed2b744ccc01d5c15608cc0c884dda94e57750;hp=a63c45bd9ccb64fe55cde236893830d25d700de6;hpb=2f7b68ffde472d1faf95f7402056ad0a0feab1fb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php
index a63c45bd9c..2a6f8a8b7a 100644
--- a/maintenance/mergeMessageFileList.php
+++ b/maintenance/mergeMessageFileList.php
@@ -43,7 +43,12 @@ class MergeMessageFileList extends Maintenance {
 
 	function __construct() {
 		parent::__construct();
-		$this->addOption( 'list-file', 'A file containing a list of extension setup files, one per line.', false, true );
+		$this->addOption(
+			'list-file',
+			'A file containing a list of extension setup files, one per line.',
+			false,
+			true
+		);
 		$this->addOption( 'extensions-dir', 'Path where extensions can be found.', false, true );
 		$this->addOption( 'output', 'Send output to this file (omit for stdout)', false, true );
 		$this->mDescription = 'Merge $wgExtensionMessagesFiles and $wgMessagesDirs from ' .
@@ -51,7 +56,10 @@ class MergeMessageFileList extends Maintenance {
 	}
 
 	public function execute() {
-		global $mmfl, $wgExtensionEntryPointListFiles;
+		// @codingStandardsIgnoreStart Ignore error: Global variable "$mmfl" is lacking 'wg' prefix
+		global $mmfl;
+		// @codingStandardsIgnoreEnd
+		global $wgExtensionEntryPointListFiles;
 
 		if ( !count( $wgExtensionEntryPointListFiles )
 			&& !$this->hasOption( 'list-file' )
@@ -117,6 +125,7 @@ class MergeMessageFileList extends Maintenance {
 		if ( $fileLines === false ) {
 			$this->hasError = true;
 			$this->error( "Unable to open list file $fileName." );
+
 			return $files;
 		}
 		# Strip comments, discard empty lines, and trim leading and trailing
@@ -134,6 +143,7 @@ class MergeMessageFileList extends Maintenance {
 				}
 			}
 		}
+
 		return $files;
 	}
 }