From d8f23e62b03e63f9b24eed924a92e711b0cf41ef Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Mon, 26 Jul 2010 20:29:55 +0000
Subject: [PATCH] Revert r69841, r69882, r69892, r69896, r69910 in
 phase3/maintenance/language because rebuildLanguage.php was broken.

This prevented message updates by Raymond from translatewiki.net.

Reported issues:
* Warning: in_array() expects parameter 2 to be array, null given in maintenance\language\languages.inc on line 173
* Warning: in_array() expects parameter 2 to be array, null given in maintenance\language\languages.inc on line 175
* Warning: in_array(): Wrong datatype for second argument in phase3\maintenance\language\languages.inc on line 175
---
 maintenance/language/StatOutputs.php        | 3 ++-
 maintenance/language/checkLanguage.inc      | 2 +-
 maintenance/language/diffLanguage.php       | 1 +
 maintenance/language/dumpMessages.php       | 1 -
 maintenance/language/languages.inc          | 3 ---
 maintenance/language/writeMessagesArray.inc | 2 --
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/maintenance/language/StatOutputs.php b/maintenance/language/StatOutputs.php
index c1d61018d8..7d69bf7318 100644
--- a/maintenance/language/StatOutputs.php
+++ b/maintenance/language/StatOutputs.php
@@ -31,6 +31,7 @@ class statsOutput {
 /** Outputs WikiText */
 class wikiStatsOutput extends statsOutput {
 	function heading() {
+		global $IP;
 		$version = SpecialVersion::getVersion( 'nodb' );
 		echo "'''Statistics are based on:''' <code>" . $version . "</code>\n\n";
 		echo "'''Note:''' These statistics can be generated by running <code>php maintenance/language/transstat.php</code>.\n\n";
@@ -66,7 +67,7 @@ class wikiStatsOutput extends statsOutput {
 		$blue = '00';
 		$color = $red . $green . $blue;
 
-		$percent = parent::formatPercent( $subset, $total, $revert, $accuracy );
+		$percent = statsOutput::formatPercent( $subset, $total, $revert, $accuracy );
 		return 'bgcolor="#' . $color . '"|' . $percent;
 	}
 }
diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc
index 13fbdaee85..765c2b714c 100644
--- a/maintenance/language/checkLanguage.inc
+++ b/maintenance/language/checkLanguage.inc
@@ -383,7 +383,7 @@ ENDS;
 	 * @return The checks results as wiki text.
 	 */
 	function outputWiki() {
-		global $wgContLang;
+		global $wgContLang, $IP;
 		$detailText = '';
 		$rows[] = '! Language !! Code !! Total !! ' . implode( ' !! ', array_diff( $this->checks, $this->nonMessageChecks() ) );
 		foreach ( $this->results as $code => $results ) {
diff --git a/maintenance/language/diffLanguage.php b/maintenance/language/diffLanguage.php
index 45357b66a3..4ead2cee23 100644
--- a/maintenance/language/diffLanguage.php
+++ b/maintenance/language/diffLanguage.php
@@ -75,6 +75,7 @@ function getMediawikiMessages( $languageCode = 'En' ) {
 
 	$foo = "wgAllMessages$languageCode";
 	global $$foo;
+	global $wgSkinNamesEn; // potentially unused global declaration?
 
 	// it might already be loaded in LocalSettings.php
 	if ( !isset( $$foo ) ) {
diff --git a/maintenance/language/dumpMessages.php b/maintenance/language/dumpMessages.php
index 9c69ba0e91..c83e7198f2 100644
--- a/maintenance/language/dumpMessages.php
+++ b/maintenance/language/dumpMessages.php
@@ -31,7 +31,6 @@ class DumpMessages extends Maintenance {
 	}
 	
 	public function execute() {
-		global $wgVersion;
 		$messages = array();
 		foreach ( array_keys( Language::getMessagesFor( 'en' ) ) as $key ) {
 			$messages[$key] = wfMsg( $key );
diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc
index 47373a2c63..98464292ec 100644
--- a/maintenance/language/languages.inc
+++ b/maintenance/language/languages.inc
@@ -32,9 +32,6 @@ class languages {
 	 */
 	function __construct( $exif = true ) {
 		require( dirname(__FILE__) . '/messageTypes.inc' );
-
-		global $wgIgnoredMessages, $wgOptionalMessages, $wgEXIFMessages;
-
 		$this->mIgnoredMessages = $wgIgnoredMessages;
 		if ( $exif ) {
 			$this->mOptionalMessages = array_merge( $wgOptionalMessages );
diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc
index 4e64dcb0b5..e3a48abdc2 100644
--- a/maintenance/language/writeMessagesArray.inc
+++ b/maintenance/language/writeMessagesArray.inc
@@ -80,8 +80,6 @@ class MessageWriter {
 		# Load messages
 		$dir = $prefix ? $prefix : dirname( __FILE__ );
 
-		global $wgMessageStructure, $wgBlockComments, $wgIgnoredMessages, $wgOptionalMessages;
-
 		require( $dir . '/messages.inc' );
 		self::$messageStructure = $wgMessageStructure;
 		self::$blockComments = $wgBlockComments;
-- 
2.20.1