1 files changed, 18 insertions, 19 deletions

diff --git a/maintenance/language/rebuildLanguage.php b/maintenance/language/rebuildLanguage.php
index 6c624ca3..fd8d62ee 100644
--- a/maintenance/language/rebuildLanguage.php
+++ b/maintenance/language/rebuildLanguage.php
@@ -7,7 +7,7 @@
  * @defgroup MaintenanceLanguage MaintenanceLanguage
  */
 
-require_once( dirname(__FILE__).'/../commandLine.inc' );
+require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
 require_once( 'languages.inc' );
 require_once( 'writeMessagesArray.inc' );
 
@@ -21,11 +21,10 @@ require_once( 'writeMessagesArray.inc' );
  * @param $removeDupes Remove the duplicated messages?
  * @param $dupeMsgSource The source file intended to remove from the array.
  */
-function rebuildLanguage( $code, $write, $listUnknown, $removeUnknown, $removeDupes, $dupeMsgSource ) {
-	global $wgLanguages;
-	$messages = $wgLanguages->getMessages( $code );
+function rebuildLanguage( $languages, $code, $write, $listUnknown, $removeUnknown, $removeDupes, $dupeMsgSource ) {
+	$messages = $languages->getMessages( $code );
 	$messages = $messages['all'];
-	if ($removeDupes) {
+	if ( $removeDupes ) {
 		$messages = removeDupes( $messages, $dupeMsgSource );
 	}
 	MessageWriter::writeMessagesToFile( $messages, $code, $write, $listUnknown, $removeUnknown );
@@ -39,20 +38,20 @@ function rebuildLanguage( $code, $write, $listUnknown, $removeUnknown, $removeDu
  * @return $newMsgArray The output message array, with duplicates removed.
  */
 function removeDupes( $oldMsgArray, $dupeMsgSource ) {
-	if (file_exists($dupeMsgSource)) {
-		include($dupeMsgSource);
-		if (!isset($dupeMessages)) {
-			echo("There are no duplicated messages in the source file provided.");
-			exit(1);
+	if ( file_exists( $dupeMsgSource ) ) {
+		include( $dupeMsgSource );
+		if ( !isset( $dupeMessages ) ) {
+			echo( "There are no duplicated messages in the source file provided." );
+			exit( 1 );
 		}
 	} else {
-		echo ("The specified file $dupeMsgSource cannot be found.");
-		exit(1);
+		echo ( "The specified file $dupeMsgSource cannot be found." );
+		exit( 1 );
 	}
 	$newMsgArray = $oldMsgArray;
-	foreach ($oldMsgArray as $key => $value) {
+	foreach ( $oldMsgArray as $key => $value ) {
 		if ( array_key_exists( $key, $dupeMessages ) ) {
-			unset($newMsgArray[$key]);
+			unset( $newMsgArray[$key] );
 		}
 	}
 	return $newMsgArray;
@@ -72,7 +71,7 @@ Options:
 	* remove-duplicates: Remove duplicated messages based on a PHP source file.
 
 TEXT;
-	exit(1);
+	exit( 1 );
 }
 
 # Get the language code
@@ -96,13 +95,13 @@ $wgRemoveUnknownMessages = isset( $options['remove-unknown'] );
 $wgRemoveDuplicateMessages = isset( $options['remove-duplicates'] );
 
 # Get language objects
-$wgLanguages = new languages();
+$languages = new languages();
 
 # Write all the language
 if ( $wgCode == 'all' ) {
-	foreach ( $wgLanguages->getLanguages() as $language ) {
-		rebuildLanguage( $language, $wgWriteToFile, $wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages, $wgDupeMessageSource );
+	foreach ( $languages->getLanguages() as $languageCode ) {
+		rebuildLanguage( $languages, $languageCode, $wgWriteToFile, $wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages, $wgDupeMessageSource );
 	}
 } else {
-	rebuildLanguage( $wgCode, $wgWriteToFile, $wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages, $wgDupeMessageSource );
+	rebuildLanguage( $languages, $wgCode, $wgWriteToFile, $wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages, $wgDupeMessageSource );
 }