From bbf16f8c3ab661427270580e1bea628cfd25fec8 Mon Sep 17 00:00:00 2001
From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 12 Mar 2011 11:08:20 +0000
Subject: [PATCH] Follow-up r83298: keep the two elements of the message
 separate in an array in HTMLSelectAndOtherField::loadDataFromRequest(), fixes
 various bugs with validation, defaults, and normalisation.

---
 includes/HTMLForm.php | 53 +++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index fb78970e04..1010229a10 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1533,8 +1533,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 	}
 
 	function getInputHTML( $value ) {
-
-		$select = parent::getInputHTML( $value );
+		$select = parent::getInputHTML( $value[1] );
 
 		$textAttribs = array(
 			'id' => $this->mID . '-other',
@@ -1549,7 +1548,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 
 		$textbox = Html::input(
 			$this->mName . '-other',
-			'',
+			$value[2],
 			'text',
 			$textAttribs
 		);
@@ -1557,6 +1556,10 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 		return "$select<br />\n$textbox";
 	}
 
+	/**
+	 * @param  $request WebRequest
+	 * @return Array( <overall message>, <select value>, <text field value> )
+	 */
 	function loadDataFromRequest( $request ) {
 		if ( $request->getCheck( $this->mName ) ) {
 
@@ -1564,27 +1567,22 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 			$text = $request->getText( $this->mName . '-other' );
 
 			if ( $list == 'other' ) {
-				return $text;
+				$final = $text;
+			} elseif( !in_array( $list, $this->mFlatOptions ) ){
+				# User has spoofed the select form to give an option which wasn't
+				# in the original offer.  Sulk...
+				$final = $text;
+			} elseif( $text == '' ) {
+				$final = $list;
 			} else {
-				# Need to get the value from the key
-				if( in_array( $list, $this->mFlatOptions ) ){
-					$list = $this->mFlatOptions[$list];
-				} else {
-					# User has spoofed the select form to give an option which wasn't
-					# in the original offer.  Sulk...
-					return $text;
-				}
-			}
-
-			if( $text == '' ) {
-				return $list;
-			} else {
-				return $list . wfMsgForContent( 'colon-separator' ) . $text;
+				$final = $list . wfMsgForContent( 'colon-separator' ) . $text;
 			}
 
 		} else {
-			return $this->getDefault();
+			$final = $this->getDefault();
+			$list = $text = '';
 		}
+		return array( $final, $list, $text );
 	}
 
 	function getSize() {
@@ -1592,6 +1590,23 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
 			? $this->mParams['size']
 			: 45;
 	}
+
+	function validate( $value, $alldata ) {
+		# HTMLSelectField forces $value to be one of the options in the select
+		# field, which is not useful here.  But we do want the validation further up
+		# the chain
+		$p = parent::validate( $value[1], $alldata );
+
+		if ( $p !== true ) {
+			return $p;
+		}
+
+		if( isset( $this->mParams['required'] ) && $value[1] === '' ){
+			return wfMsgExt( 'htmlform-required', 'parseinline' );
+		}
+
+		return true;
+	}
 }
 
 /**
-- 
2.20.1