From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 2 May 2016 20:52:46 +0000 (+0000)
Subject: Merge "Unify HTMLForm message handling"
X-Git-Tag: 1.31.0-rc.0~7125
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=46deecce89b76e2d45e61f5f696928bb859ae324;p=lhc%2Fweb%2Fwiklou.git

Merge "Unify HTMLForm message handling"
---

46deecce89b76e2d45e61f5f696928bb859ae324
diff --cc includes/htmlform/HTMLFormField.php
index d14fa90d94,a5d994db68..380b11d441
--- a/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'] );
 +	}
  }