allow 'uselang' and 'useskin' to be specified in the URL parameters, with

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 1b31c18..7f5b6a4 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -213,7 +213,9 @@ wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-language2' );
 
 // wgLanguageCode now specifically means the UI language
-$wgLanguageCode = $wgUser->getOption('language');
+$wgLanguageCode = $wgRequest->getText('uselang', '');
+if ($wgLanguageCode == '')
+       $wgLanguageCode = $wgUser->getOption('language');
 # Validate $wgLanguageCode, which will soon be sent to an eval()
 if( empty( $wgLanguageCode ) || preg_match( '/^[^a-z-]*$/', $wgLanguageCode ) ) {
        $wgLanguageCode = $wgContLanguageCode;