Avoid gratuitously breaking configurations: continue to use

$wgLanguageCode in LocalSettings.php, and pass that value on
to $wgContLanguageCode internally.

diff --git a/config/index.php b/config/index.php
index 53e3064..7565439 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -885,7 +885,7 @@ if ( \$wgCommandLineMode ) {
 
 \$wgLocalInterwiki   = \$wgSitename;
 
-\$wgContLanguageCode = \"{$slconf['LanguageCode']}\";
+\$wgLanguageCode = \"{$slconf['LanguageCode']}\";
 \$wgUseLatin1 = " . ($conf->Latin1 ? 'true' : 'false') . ";\n
 
 \$wgProxyKey = \"$proxyKey\";

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b68250a..ce6fe0e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -260,7 +260,7 @@ $wgUseTurckShm      = false;
  * Default to 'en'. Should be one of ./language/Language(.*).php
  * @global string $wgLanguageCode
  */
-$wgContLanguageCode     = 'en';
+$wgLanguageCode     = 'en';
 
 /**
  * Filename of a language file generated by dumpMessages.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 792acd9..983f15d 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -250,6 +250,10 @@ function setupLangObj(&$langclass, $langcode) {
 
 require_once( 'languages/Language.php' );
 
+# $wgLanguageCode may be changed later to fit with user preference.
+# The content language will remain fixed as per the configuration,
+# so let's keep it.
+$wgContLanguageCode = $wgLanguageCode;
 $wgContLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgContLanguageCode ) );
 
 $wgContLang = setupLangObj( $wgContLangClass, $wgContLangClass );