From: Robert Leverington <roberthl@users.mediawiki.org>
Date: Mon, 5 May 2008 14:14:28 +0000 (+0000)
Subject: * Missed the extension name array key.
X-Git-Tag: 1.31.0-rc.0~47904
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=1cb51c3fc2ae7fd42444a3281ce4ebc967f4d0cd;p=lhc%2Fweb%2Fwiklou.git

* Missed the extension name array key.
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index acc1e244d0..e9b1d8b155 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2484,24 +2484,28 @@ function wfBoolToStr( $value ) {
  */
 function wfLoadExtensionMessages( $extensionName, $langcode = false ) {
 	global $wgExtensionMessagesFiles, $wgMessageCache, $wgLang, $wgContLang;
-	
+
 	#For recording whether extension message files have been loaded in a given language.
 	static $loaded = array();
-	
-	if( !$langcode && !array_key_exists( '*', $loaded ) ) {
+
+	if( !array_key_exists( $extensionName, $loaded ) ) {
+		$wgExtensionMessagesFiles[$extensionName] = array();
+	}
+
+	if( !$langcode && !array_key_exists( '*', $loaded[$extensionName] ) ) {
 		# Just do en, content language and user language.
 		$wgMessageCache->loadMessagesFile( $wgExtensionMessagesFiles[$extensionName], false );
 		# Mark that they have been loaded.
-		$loaded['en'] = true;
-		$loaded[$wgLang->getCode()] = true;
-		$loaded[$wgContLang->getCode()] = true;
+		$loaded[$extensionName]['en'] = true;
+		$loaded[$extensionName][$wgLang->getCode()] = true;
+		$loaded[$extensionName][$wgContLang->getCode()] = true;
 		# Mark that this part has been done to avoid weird if statements.
-		$loaded['*'] = true;
-	} elseif( is_string( $langcode ) && !array_key_exists( $langcode, $loaded ) ) {
+		$loaded[$extensionName]['*'] = true;
+	} elseif( is_string( $langcode ) && !array_key_exists( $langcode, $loaded[$extensionName] ) ) {
 		# Load messages for specified language.
 		$wgMessageCache->loadMessagesFile( $wgExtensionMessagesFiles[$extensionName], $langcode );
 		# Mark that they have been loaded.
-		$loaded[$langcode] = true;
+		$loaded[$extensionName][$langcode] = true;
 	}
 }