{
var $mCache, $mUseCache, $mDisable, $mExpiry;
var $mMemcKey, $mKeys;
-
- function MessageCache( $useMemCached, $useDB, $expiry, $memcPrefix ) {
- $this->initialise( $useMemCached, $useDB, $expiry, $memcPrefix );
- }
+
+ var $mInitialised = false;
function initialise( $useMemCached, $useDB, $expiry, $memcPrefix ) {
$this->mUseCache = $useMemCached;
$this->mExpiry = $expiry;
$this->mMemcKey = "$memcPrefix:messages";
$this->mKeys = false; # initialised on demand
-
+ $this->mInitialised = true;
+
$this->load();
}
function get( $key, $useDB ) {
global $wgLang, $wgLanguageCode;
-
+
+ # If uninitialised, someone is trying to call this halfway through Setup.php
+ if ( !$this->mInitialised ) {
+ return "<$key>";
+ }
+
if ( $this->mDisable ) {
return $wgLang->getMessage( $key );
}
include_once( "Language.php" );
-$wgMessageCache = new MessageCache( $wgUseMemCached, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname );
+$wgMessageCache = new MessageCache;
$wgOut = new OutputPage();
wfDebug( "\n\n" );
include_once( "LanguageUtf8.php" );
$wgLangClass = "LanguageUtf8";
}
+
$wgLang = new $wgLangClass();
+if ( !is_object($wgLang) ) {
+ print "No language class ($wgLang)\N";
+}
+$wgMessageCache->initialise( $wgUseMemCached, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname );
if ( $wgUseDynamicDates ) {
include_once( "DateFormatter.php" );