From b4ccf8ae4ab360dbeb587e26a17be1ab868ecb4f Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Thu, 16 Nov 2006 16:49:23 +0000 Subject: [PATCH] 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. --- includes/MessageCache.php | 10 ---------- 1 file changed, 10 deletions(-) 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 ); -- 2.20.1