From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 23 Dec 2004 03:52:48 +0000 (+0000)
Subject: Merge blocked user fix from REL1_4
X-Git-Tag: 1.5.0alpha1~1053
X-Git-Url: https://git.cyclocoop.org/admin/%7B%24plugin.url%7Cescape%7D?a=commitdiff_plain;h=4778ec91eb3361e5ad77d0117025167af7f2b142;p=lhc%2Fweb%2Fwiklou.git

Merge blocked user fix from REL1_4
---

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);