* @ingroup Deployment
* @since 1.17
*/
-class WebInstaller extends Installer {
+class
+WebInstaller extends Installer {
/**
* @var WebInstallerOutput
$this->setVar( '_UserLang', $wgLanguageCode );
} else {
$wgLanguageCode = $this->getVar( 'wgLanguageCode' );
- $wgLang = Language::factory( $this->getVar( '_UserLang' ) );
$wgContLang = Language::factory( $wgLanguageCode );
}
}
public function execute() {
global $wgLang;
$r = $this->parent->request;
- $userLang = $r->getVal( 'UserLang' );
+ $userLang = $r->getVal( 'userlang' );
$contLang = $r->getVal( 'ContLang' );
$lifetime = intval( ini_get( 'session.gc_maxlifetime' ) );
}
$this->startForm();
$s = Html::hidden( 'LanguageRequestTime', time() ) .
- $this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang,
+ $this->getLanguageSelector( 'userlang', 'config-your-language', $userLang,
$this->parent->getHelpBox( 'config-your-language-help' ) ) .
$this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang,
$this->parent->getHelpBox( 'config-wiki-language-help' ) );
$session = array();
}
- if ( isset( $session['settings']['_UserLang'] ) ) {
+ if ( !is_null( $wgRequest->getVal( 'uselang' ) ) ) {
+ $langCode = $wgRequest->getVal( 'uselang' );
+ } elseif ( isset( $session['settings']['_UserLang'] ) ) {
$langCode = $session['settings']['_UserLang'];
- } elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) {
- $langCode = $wgRequest->getVal( 'UserLang' );
} else {
$langCode = 'en';
}