dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* (bug 153) Adjust thumbnail size calculations to match consistently;
[lhc/web/wiklou.git]
/
includes
/
GlobalFunctions.php
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
4a5e608
..
57bd132
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-393,7
+393,8
@@
function wfMsgGetKey( $key, $useDB, $forContent = false, $transform = true ) {
global $wgContLang, $wgLanguageCode;
global $wgMessageCache, $wgLang;
global $wgContLang, $wgLanguageCode;
global $wgMessageCache, $wgLang;
- $transstat = $wgMessageCache->getTransform();
+ if ( is_object( $wgMessageCache ) )
+ $transstat = $wgMessageCache->getTransform();
if( is_object( $wgMessageCache ) ) {
if ( ! $transform )
if( is_object( $wgMessageCache ) ) {
if ( ! $transform )
@@
-421,7
+422,7
@@
function wfMsgGetKey( $key, $useDB, $forContent = false, $transform = true ) {
}
}
}
}
- if ( ! $transform )
+ if (
is_object( $wgMessageCache ) &&
! $transform )
$wgMessageCache->setTransform( $transstat );
return $message;
$wgMessageCache->setTransform( $transstat );
return $message;