Merge blocked user fix from REL1_4

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index e068351..9c445c5 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -399,7 +399,11 @@ function wfMsgReal( $key, $args, $useDB, $forContent=false ) {
                }
 
                wfSuppressWarnings();
-               $message = $lang->getMessage( $key );
+               if( is_object( $message ) ) {
+                       $message = $lang->getMessage( $key );
+               } else {
+                       $message = '';
+               }
                wfRestoreWarnings();
                if(!$message)
                        $message = Language::getMessage($key);