From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 16 Nov 2006 16:49:23 +0000 (+0000)
Subject: Removed broken redundant fallback to the Language message array. Message arrays are... 
X-Git-Tag: 1.31.0-rc.0~55173
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=b4ccf8ae4ab360dbeb587e26a17be1ab868ecb4f;p=lhc%2Fweb%2Fwiklou.git

Removed broken redundant fallback to the Language message array. Message arrays are now merged pre-cache. It's a static call on a non-static function, it actually calls back to $wgMessageCache->load(), destroying the per-process message cache on every cache miss.
---

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 9cab222ba5..058ada5aa6 100644
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -458,16 +458,6 @@ class MessageCache {
 			}
 		}
 
-		# Try the English array
-		if( $message === false && $langcode != 'en' ) {
-			wfSuppressWarnings();
-			$message = Language::getMessage( $key );
-			wfRestoreWarnings();
-			if ( is_null( $message ) ) {
-				$message = false;
-			}
-		}
-
 		# Try the array of another language
 		if( $message === false && strpos( $key, '/' ) ) {
 			$message = explode( '/', $key );