Changed installation code so that wgContLanguageCode is set, replacing wgLanguageCode.

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 7a9ed19..8e19b3e 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -235,7 +235,7 @@ if( count( $wgUserLanguages ) &&
 wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-language' );
 
-function setupLangObj($langclass, $langcode) {
+function setupLangObj(&$langclass, $langcode) {
     global $wgUseLatin1;
 
 
@@ -260,13 +260,12 @@ function setupLangObj($langclass, $langcode) {
     return $lang;
 }
 
-/* TODO: change the installation script so that 
-   wgContLanguageCode is set there instead of here
-*/
 require_once( 'languages/Language.php' );
-$wgContLanguageCode = $wgLanguageCode;
+
 $wgContLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgContLanguageCode ) );
-$wgContLang = setupLangObj(&$wgContLangClass, $wgContLangClass);
+
+$wgContLang = setupLangObj($wgContLangClass, $wgContLangClass);
+ $n = get_class($wgContLang);
 
 // set default user option from content language
 if(!$wgUser->mDataLoaded) { $wgUser->loadDefaultFromLanguage(); }
@@ -280,7 +279,7 @@ $wgLangClass = 'Language'. str_replace( '-', '_', ucfirst( $wgLanguageCode ) );
  }
  else {
      include_once("languages/$wgLangClass.php");
-     $wgLang = setupLangObj(&$wgLangClass, $wgLanguageCode);
+     $wgLang = setupLangObj($wgLangClass, $wgLanguageCode);
  }
 
 
@@ -288,13 +287,13 @@ wfProfileOut( $fname.'-language' );
 wfProfileIn( $fname.'-MessageCache' );
 
 $wgContMessageCache = new MessageCache;
-$wgContMessageCache->initialise( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname, true );
+$wgContMessageCache->initialise( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname, $wgContLang, $wgContLanguageCode );
 if($wgLangClass == $wgContLangClass) {
     $wgMessageCache = &$wgContMessageCache;
 }
 else {
     $wgMessageCache = new MessageCache;
-    $wgMessageCache->initialise( $messageMemc,false , $wgMsgCacheExpiry, $wgDBname.":$wgLangClass", false);
+    $wgMessageCache->initialise( $messageMemc,false , $wgMsgCacheExpiry, $wgDBname.":$wgLangClass", $wgLang, $wgLanguageCode);
 }
 
 wfProfileOut( $fname.'-MessageCache' );