| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -12,8 +12,7 @@ |
| 13 | 13 | * @ingroup Deployment |
| 14 | 14 | * @since 1.17 |
| 15 | 15 | */ |
| 16 | | -class |
| 17 | | -WebInstaller extends Installer { |
| | 16 | +class WebInstaller extends Installer { |
| 18 | 17 | |
| 19 | 18 | /** |
| 20 | 19 | * @var WebInstallerOutput |
| 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( 'uselang' ); |
| 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( 'uselang', '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' ) ); |