From 1ba74a62136fbb1fcf29be1a14b751d053e52727 Mon Sep 17 00:00:00 2001 From: Geoffrey Mon Date: Thu, 30 Jul 2015 19:07:48 +0000 Subject: [PATCH] Use XmlSelect in WebInstallerPage Bug: T93234 Change-Id: Iba0067b4fac381e715e92d87c682261eef8d6669 --- includes/installer/WebInstallerPage.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index f7910ba5de..1de6184c5b 100644 --- a/includes/installer/WebInstallerPage.php +++ b/includes/installer/WebInstallerPage.php @@ -287,10 +287,10 @@ class WebInstallerLanguage extends WebInstallerPage { public function getLanguageSelector( $name, $label, $selectedCode, $helpHtml = '' ) { global $wgDummyLanguageCodes; - $s = $helpHtml; + $output = $helpHtml; - $s .= Html::openElement( 'select', array( 'id' => $name, 'name' => $name, - 'tabindex' => $this->parent->nextTabIndex() ) ) . "\n"; + $select = new XmlSelect( $name, $name, $selectedCode ); + $select->setAttribute( 'tabindex', $this->parent->nextTabIndex() ); $languages = Language::fetchLanguageNames(); ksort( $languages ); @@ -298,11 +298,11 @@ class WebInstallerLanguage extends WebInstallerPage { if ( isset( $wgDummyLanguageCodes[$code] ) ) { continue; } - $s .= "\n" . Xml::option( "$code - $lang", $code, $code == $selectedCode ); + $select->addOption( "$code - $lang", $code ); } - $s .= "\n\n"; - return $this->parent->label( $label, $name, $s ); + $output .= $select->getHTML(); + return $this->parent->label( $label, $name, $output ); } } -- 2.20.1