From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Wed, 16 Oct 2013 17:11:26 +0000 (+0200)
Subject: Fix default value of domain select box in templates
X-Git-Tag: 1.31.0-rc.0~17933^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=3e2562f74a88bc7c4d66b253734d0707faac4e95;p=lhc%2Fweb%2Fwiklou.git

Fix default value of domain select box in templates

There is no such thing as <select value="">. Use XmlSelect class to
properly build the selector instead.

Change-Id: If23071f29bf1ca8d7364453ec6c464127fecb509
---

diff --git a/includes/templates/Usercreate.php b/includes/templates/Usercreate.php
index 4750af95e5..2f569d9543 100644
--- a/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@ -113,17 +113,16 @@ class UsercreateTemplate extends BaseTemplate {
 
 			<?php
 			if ( $this->data['usedomain'] ) {
-				$doms = "";
+				$select = new XmlSelect( 'wpDomain', false, $this->data['domain'] );
+				$select->setAttribute( 'tabindex', 4 );
 				foreach ( $this->data['domainnames'] as $dom ) {
-					$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+					$select->addOption( $dom );
 				}
 			?>
 				<div id="mw-user-domain-section">
 					<label for="wpDomain"><?php $this->msg( 'yourdomainname' ); ?></label>
 					<div class="mw-input">
-						<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>" tabindex="4">
-							<?php echo $doms ?>
-						</select>
+						<?php echo $select->getHTML(); ?>
 					</div>
 				</div>
 			<?php } ?>
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 5eb609487e..38e071c86a 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -113,16 +113,15 @@ class UserloginTemplate extends BaseTemplate {
 
 			<?php
 			if ( isset( $this->data['usedomain'] ) && $this->data['usedomain'] ) {
-				$doms = "";
+				$select = new XmlSelect( 'wpDomain', false, $this->data['domain'] );
+				$select->setAttribute( 'tabindex', 3 );
 				foreach ( $this->data['domainnames'] as $dom ) {
-					$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+					$select->addOption( $dom );
 				}
 			?>
 				<div id="mw-user-domain-section">
 					<label for='wpDomain'><?php $this->msg( 'yourdomainname' ); ?></label>
-					<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>" tabindex="3">
-						<?php echo $doms; ?>
-					</select>
+					<?php echo $select->getHTML(); ?>
 				</div>
 			<?php } ?>