From 225c34df76823dde0b1323449181ba662ce1697c Mon Sep 17 00:00:00 2001
From: Robert Leverington <roberthl@users.mediawiki.org>
Date: Sun, 27 Apr 2008 14:50:55 +0000
Subject: [PATCH] Revert r33918, no longer works given new fallback caching and
 there are alternate methods for determining message fallback.

---
 includes/GlobalFunctions.php | 11 +++--------
 includes/MessageCache.php    |  9 +--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 5a1b47a72f..3594fe5f3e 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -447,17 +447,15 @@ function wfMsgWeirdKey ( $key ) {
  * @param string $langcode Code of the language to get the message for, or
  *                         behaves as a content language switch if it is a 
  *                         boolean.
- * @param bool $fallback Whether or not to fallback to a different language if
- *                       it is not found in the selected one.
  * @return string
  * @private
  */
-function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true, $fallback = true ) {
+function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) {
 	global $wgParser, $wgContLang, $wgMessageCache, $wgLang;
 
 	# If $wgMessageCache isn't initialised yet, try to return something sensible.
 	if( is_object( $wgMessageCache ) ) {
-		$message = $wgMessageCache->get( $key, $useDB, $langCode, false, $fallback );
+		$message = $wgMessageCache->get( $key, $useDB, $langCode );
 		if ( $transform ) {
 			$message = $wgMessageCache->transform( $message );
 		}
@@ -566,7 +564,6 @@ function wfMsgWikiHtml( $key ) {
  *  <i>replaceafter</i>: parameters are substituted after parsing or escaping
  *  <i>parsemag</i>: transform the message using magic phrases
  *  <i>content</i>: fetch message for content language instead of interface
- *  <i>nofallback</i>: do not fallback to a different language
  *  <i>language</i>: language code to fetch message for (overriden by <i>content</i>), its behaviour
  *                   with parser, parseinline and parsemag is undefined.
  * Behavior for conflicting options (e.g., parse+parseinline) is undefined.
@@ -597,9 +594,7 @@ function wfMsgExt( $key, $options ) {
 		$langCode = false;
 	}
 
-	$fallback = !in_array('nofallback', $options);
-
-	$string = wfMsgGetKey( $key, /*DB*/true, $langCode, /*Transform*/false, /*Fallback*/$fallback );
+	$string = wfMsgGetKey( $key, /*DB*/true, $langCode, /*Transform*/false );
 
 	if( !in_array('replaceafter', $options) ) {
 		$string = wfMsgReplaceArgs( $string, $args );
diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 7637fcbac0..bbea94abe0 100644
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -407,10 +407,8 @@ class MessageCache {
 	 *                         use the wikis content language (also as a
 	 *                         fallback).
 	 * @param bool $isFullKey Specifies whether $key is a two part key "lang/msg".
-	 * @param bool $fallback Whether or not to fallback to a different language if
-	 *                       it is not found in the selected one.
 	 */
-	function get( $key, $useDB = true, $langcode = true, $isFullKey = false, $fallback = true ) {
+	function get( $key, $useDB = true, $langcode = true, $isFullKey = false ) {
 		global $wgContLanguageCode, $wgContLang, $wgLang;
 
 		# Identify which language to get or create a language object for.
@@ -478,11 +476,6 @@ class MessageCache {
 			}
 		}
 
-		# Don't fall back if asked not to.
-		if( !$fallback ) {
-			return '&lt;' . htmlspecialchars($key) . '&gt;';
-		}
-
 		# Try the array of another language
 		$pos = strrpos( $lckey, '/' );
 		if( $message === false && $pos !== false) {
-- 
2.20.1