Revert r33918, no longer works given new fallback caching and there are alternate...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 5a1b47a..3594fe5 100644 (file)
--- 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 7637fcb..bbea94a 100644 (file)
--- 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 '<' . htmlspecialchars($key) . '>';
-               }
-
                # Try the array of another language
                $pos = strrpos( $lckey, '/' );
                if( $message === false && $pos !== false) {