dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cd4d2fb
)
Merge blocked user fix from REL1_4
author
Brion Vibber
<brion@users.mediawiki.org>
Thu, 23 Dec 2004 03:52:48 +0000
(
03:52
+0000)
committer
Brion Vibber
<brion@users.mediawiki.org>
Thu, 23 Dec 2004 03:52:48 +0000
(
03:52
+0000)
includes/GlobalFunctions.php
patch
|
blob
|
history
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);