From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 25 Nov 2016 09:11:07 +0000 (+0000)
Subject: Merge "HTMLForm: Allow returning Message objects from HTMLFormField::validate()"
X-Git-Tag: 1.31.0-rc.0~4763
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=ff70e103def9601f40836cbd9022e1267200510e;p=lhc%2Fweb%2Fwiklou.git

Merge "HTMLForm: Allow returning Message objects from HTMLFormField::validate()"
---

ff70e103def9601f40836cbd9022e1267200510e
diff --cc includes/htmlform/fields/HTMLAutoCompleteSelectField.php
index b0890c6778,87009f85d7..63e77cec9d
--- a/includes/htmlform/fields/HTMLAutoCompleteSelectField.php
+++ b/includes/htmlform/fields/HTMLAutoCompleteSelectField.php
@@@ -111,10 -91,10 +111,10 @@@ class HTMLAutoCompleteSelectField exten
  
  		if ( in_array( strval( $value ), $validOptions, true ) ) {
  			return true;
 -		} elseif ( in_array( strval( $value ), $this->autocomplete, true ) ) {
 +		} elseif ( in_array( strval( $value ), $this->autocompleteData, true ) ) {
  			return true;
  		} elseif ( $this->mParams['require-match'] ) {
- 			return $this->msg( 'htmlform-select-badoption' )->parse();
+ 			return $this->msg( 'htmlform-select-badoption' );
  		}
  
  		return true;