Make MessageCache::get() return false if the requested message does not exist, and...

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 36860e3..a038fb0 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -750,7 +750,9 @@ function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) {
        # If $wgMessageCache isn't initialised yet, try to return something sensible.
        if( is_object( $wgMessageCache ) ) {
                $message = $wgMessageCache->get( $key, $useDB, $langCode );
-               if ( $transform ) {
+               if( $message === false ){
+                       $message = '<' . htmlspecialchars( $key ) . '>';
+               } elseif ( $transform ) {
                        $message = $wgMessageCache->transform( $message );
                }
        } else {
@@ -2267,12 +2269,12 @@ function wfAppendToArrayIfNotDefault( $key, $value, $default, &$changed ) {
  * looked up didn't exist but a XHTML string, this function checks for the
  * nonexistance of messages by looking at wfMsg() output
  *
- * @param $msg      String: the message key looked up
- * @param $wfMsgOut String: the output of wfMsg*()
- * @return Boolean
+ * @param $key      String: the message key looked up
+ * @return Boolean True if the message *doesn't* exist.
  */
-function wfEmptyMsg( $msg, $wfMsgOut ) {
-       return $wfMsgOut === htmlspecialchars( "<$msg>" );
+function wfEmptyMsg( $key ) {
+       global $wgMessageCache;
+       return $wgMessageCache->get( $key ) === false;
 }
 
 /**

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 2c53430..318d1de 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -500,7 +500,7 @@ class MessageCache {
 
                if ( strval( $key ) === '' ) {
                        # Shortcut: the empty key is always missing
-                       return '<>';
+                       return false;
                }
 
                $lang = wfGetLangObj( $langcode );
@@ -558,7 +558,7 @@ class MessageCache {
 
                # Final fallback
                if( $message === false ) {
-                       return '<' . htmlspecialchars($key) . '>';
+                       return false;
                }
 
                # Fix whitespace

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 3f23fab..9e188ce 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -834,6 +834,11 @@ class LanguageConverter {
 
                if ( strpos( $code, '/' ) === false ) {
                        $txt = $wgMessageCache->get( 'Conversiontable', true, $code );
+                       if( $txt === false ){
+                               # FIXME: this method doesn't seem to be expecting
+                               # this possible outcome...
+                               $txt = '<Conversiontable>';
+                       }
                } else {
                        $title = Title::makeTitleSafe( NS_MEDIAWIKI,
                                                                                   "Conversiontable/$code" );