From 080a017fd9dcec29e286d75ec91b2ac4de95c862 Mon Sep 17 00:00:00 2001 From: Liangent Date: Tue, 26 Mar 2013 23:42:48 +0800 Subject: [PATCH] Use MessageCache::getMsgFromNamespace() to fetch conversion tables. After Iaaf6cceb, MessageCache::get() goes through the fallback chain, which is unwanted for conversion tables (for example, we don't want zh-hans table for zh, where zh means "no conversion"). Since the only needed feature is to fetch text from MediaWiki namespace (conversion tables in PHP are stored somewhere else), it is now changed to use MessageCache::getMsgFromNamespace() instead to avoid fallbacks. Change-Id: I46e0be31c9c0fe0a6e4923fc1aff0fbbadbf1d67 --- includes/cache/MessageCache.php | 4 ++++ languages/LanguageConverter.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php index 7425978a10..dd29b21107 100644 --- a/includes/cache/MessageCache.php +++ b/includes/cache/MessageCache.php @@ -729,6 +729,10 @@ class MessageCache { * Get a message from the MediaWiki namespace, with caching. The key must * first be converted to two-part lang/msg form if necessary. * + * Unlike self::get(), this function doesn't resolve fallback chains, and + * some callers require this behavior. LanguageConverter::parseCachedTable() + * and self::get() are some examples in core. + * * @param string $title Message cache key with initial uppercase letter. * @param string $code code denoting the language to try. * diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 43afe65326..e36c0855bc 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -941,7 +941,7 @@ class LanguageConverter { $parsed[$key] = true; if ( $subpage === '' ) { - $txt = MessageCache::singleton()->get( 'conversiontable', true, $code ); + $txt = MessageCache::singleton()->getMsgFromNamespace( $key, $code ); } else { $txt = false; $title = Title::makeTitleSafe( NS_MEDIAWIKI, $key ); -- 2.20.1