X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Finstaller%2FWebInstallerLanguage.php;h=85d1a2df60e328bd93cfe89ec3a791eaff369053;hb=aca71069e8f90f787b6d63226b69f86c3ab6aead;hp=bce07d31185e3c6b8be19c1729d5a436cb3cdf00;hpb=04d149b816c23b9a35db9e2258ee43eb04edd2d6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/WebInstallerLanguage.php b/includes/installer/WebInstallerLanguage.php
index bce07d3118..85d1a2df60 100644
--- a/includes/installer/WebInstallerLanguage.php
+++ b/includes/installer/WebInstallerLanguage.php
@@ -30,7 +30,7 @@ class WebInstallerLanguage extends WebInstallerPage {
 		$userLang = $r->getVal( 'uselang' );
 		$contLang = $r->getVal( 'ContLang' );
 
-		$languages = Language::fetchLanguageNames();
+		$languages = Language::fetchLanguageNames( null, 'mwfile' );
 		$lifetime = intval( ini_get( 'session.gc_maxlifetime' ) );
 		if ( !$lifetime ) {
 			$lifetime = 1440; // PHP default
@@ -98,21 +98,13 @@ class WebInstallerLanguage extends WebInstallerPage {
 	 * @return string
 	 */
 	public function getLanguageSelector( $name, $label, $selectedCode, $helpHtml = '' ) {
-		global $wgExtraLanguageCodes;
-
 		$output = $helpHtml;
 
 		$select = new XmlSelect( $name, $name, $selectedCode );
 		$select->setAttribute( 'tabindex', $this->parent->nextTabIndex() );
 
-		$unwantedLanguageCodes = $wgExtraLanguageCodes +
-			LanguageCode::getDeprecatedCodeMapping();
-		$languages = Language::fetchLanguageNames();
-		ksort( $languages );
+		$languages = Language::fetchLanguageNames( null, 'mwfile' );
 		foreach ( $languages as $code => $lang ) {
-			if ( isset( $unwantedLanguageCodes[$code] ) ) {
-				continue;
-			}
 			$select->addOption( "$code - $lang", $code );
 		}