From 4778ec91eb3361e5ad77d0117025167af7f2b142 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 23 Dec 2004 03:52:48 +0000
Subject: [PATCH] Merge blocked user fix from REL1_4

---
 includes/GlobalFunctions.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index e06835174c..9c445c5395 100644
--- 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);
-- 
2.20.1