| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -12,7 +12,8 @@ |
| 13 | 13 | * @ingroup Deployment |
| 14 | 14 | * @since 1.17 |
| 15 | 15 | */ |
| 16 | | -class WebInstaller extends Installer { |
| | 16 | +class |
| | 17 | +WebInstaller extends Installer { |
| 17 | 18 | |
| 18 | 19 | /** |
| 19 | 20 | * @var WebInstallerOutput |
| — | — | @@ -472,7 +473,6 @@ |
| 473 | 474 | $this->setVar( '_UserLang', $wgLanguageCode ); |
| 474 | 475 | } else { |
| 475 | 476 | $wgLanguageCode = $this->getVar( 'wgLanguageCode' ); |
| 476 | | - $wgLang = Language::factory( $this->getVar( '_UserLang' ) ); |
| 477 | 477 | $wgContLang = Language::factory( $wgLanguageCode ); |
| 478 | 478 | } |
| 479 | 479 | } |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -158,7 +158,7 @@ |
| 159 | 159 | public function execute() { |
| 160 | 160 | global $wgLang; |
| 161 | 161 | $r = $this->parent->request; |
| 162 | | - $userLang = $r->getVal( 'UserLang' ); |
| | 162 | + $userLang = $r->getVal( 'userlang' ); |
| 163 | 163 | $contLang = $r->getVal( 'ContLang' ); |
| 164 | 164 | |
| 165 | 165 | $lifetime = intval( ini_get( 'session.gc_maxlifetime' ) ); |
| — | — | @@ -207,7 +207,7 @@ |
| 208 | 208 | } |
| 209 | 209 | $this->startForm(); |
| 210 | 210 | $s = Html::hidden( 'LanguageRequestTime', time() ) . |
| 211 | | - $this->getLanguageSelector( 'UserLang', 'config-your-language', $userLang, |
| | 211 | + $this->getLanguageSelector( 'userlang', 'config-your-language', $userLang, |
| 212 | 212 | $this->parent->getHelpBox( 'config-your-language-help' ) ) . |
| 213 | 213 | $this->getLanguageSelector( 'ContLang', 'config-wiki-language', $contLang, |
| 214 | 214 | $this->parent->getHelpBox( 'config-wiki-language-help' ) ); |
| Index: trunk/phase3/mw-config/index.php |
| — | — | @@ -34,10 +34,10 @@ |
| 35 | 35 | $session = array(); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | | - if ( isset( $session['settings']['_UserLang'] ) ) { |
| | 38 | + if ( !is_null( $wgRequest->getVal( 'uselang' ) ) ) { |
| | 39 | + $langCode = $wgRequest->getVal( 'uselang' ); |
| | 40 | + } elseif ( isset( $session['settings']['_UserLang'] ) ) { |
| 39 | 41 | $langCode = $session['settings']['_UserLang']; |
| 40 | | - } elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) { |
| 41 | | - $langCode = $wgRequest->getVal( 'UserLang' ); |
| 42 | 42 | } else { |
| 43 | 43 | $langCode = 'en'; |
| 44 | 44 | } |