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

diff --cc includes/htmlform/fields/HTMLAutoCompleteSelectField.php
index b0890c6,87009f8..63e77ce
--- 1/includes/htmlform/fields/HTMLAutoCompleteSelectField.php
--- 2/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;