Merge "Unify HTMLForm message handling"

diff --cc includes/htmlform/HTMLForm.php
Simple merge

diff --cc includes/htmlform/HTMLFormField.php
index d14fa90,a5d994d..380b11d
--- 1/includes/htmlform/HTMLFormField.php
--- 2/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@@ -1095,25 -1095,6 +1095,16 @@@ abstract class HTMLFormField 
         * @return Message
         */
        protected function getMessage( $value ) {
-               if ( $value instanceof Message ) {
-                       return $value;
-               } elseif ( $value instanceof MessageSpecifier ) {
-                       return Message::newFromKey( $value );
-               } elseif ( is_array( $value ) ) {
-                       $msg = array_shift( $value );
-                       return $this->msg( $msg, $value );
-               } else {
-                       return $this->msg( $value, [] );
-               }
+               return Message::newFromSpecifier( $value )->setContext( $this->mParent );
        }
 +
 +      /**
 +       * Skip this field when collecting data.
 +       * @param WebRequest $request
 +       * @return bool
 +       * @since 1.27
 +       */
 +      public function skipLoadData( $request ) {
 +              return !empty( $this->mParams['nodata'] );
 +      }
  }

diff --cc includes/htmlform/OOUIHTMLForm.php
Simple merge