X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fhtmlform%2FHTMLFormField.php;h=5f99aa0ca58b3248090b5d0c15b7d6efee8f3cdc;hb=a215e53409cf262e3d8d022197f6b34fa5ee680b;hp=890299525e6ad42767e32b5a32a2dc6d69d23e74;hpb=a5b521730095f56aef4916f73e39213f1d9b1d16;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index 890299525e..5f99aa0ca5 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -462,16 +462,6 @@ abstract class HTMLFormField {
 		if ( isset( $params['hide-if'] ) ) {
 			$this->mHideIf = $params['hide-if'];
 		}
-
-		if ( isset( $this->mParams['notice-message'] ) ) {
-			wfDeprecated( "'notice-message' parameter in HTMLForm", '1.32' );
-		}
-		if ( isset( $this->mParams['notice-messages'] ) ) {
-			wfDeprecated( "'notice-messages' parameter in HTMLForm", '1.32' );
-		}
-		if ( isset( $this->mParams['notice'] ) ) {
-			wfDeprecated( "'notice' parameter in HTMLForm", '1.32' );
-		}
 	}
 
 	/**
@@ -617,17 +607,11 @@ abstract class HTMLFormField {
 			$error = new OOUI\HtmlSnippet( $error );
 		}
 
-		$notices = $this->getNotices( 'skip deprecation' );
-		foreach ( $notices as &$notice ) {
-			$notice = new OOUI\HtmlSnippet( $notice );
-		}
-
 		$config = [
 			'classes' => [ "mw-htmlform-field-$fieldType", $this->mClass ],
 			'align' => $this->getLabelAlignOOUI(),
 			'help' => ( $help !== null && $help !== '' ) ? new OOUI\HtmlSnippet( $help ) : null,
 			'errors' => $errors,
-			'notices' => $notices,
 			'infusable' => $infusable,
 			'helpInline' => $this->isHelpInline(),
 		];
@@ -926,37 +910,6 @@ abstract class HTMLFormField {
 		return $errors;
 	}
 
-	/**
-	 * Determine notices to display for the field.
-	 *
-	 * @since 1.28
-	 * @deprecated since 1.32
-	 * @param string $skipDeprecation Pass 'skip deprecation' to avoid the deprecation
-	 *   warning (since 1.32)
-	 * @return string[]
-	 */
-	public function getNotices( $skipDeprecation = null ) {
-		if ( $skipDeprecation !== 'skip deprecation' ) {
-			wfDeprecated( __METHOD__, '1.32' );
-		}
-
-		$notices = [];
-
-		if ( isset( $this->mParams['notice-message'] ) ) {
-			$notices[] = $this->getMessage( $this->mParams['notice-message'] )->parse();
-		}
-
-		if ( isset( $this->mParams['notice-messages'] ) ) {
-			foreach ( $this->mParams['notice-messages'] as $msg ) {
-				$notices[] = $this->getMessage( $msg )->parse();
-			}
-		} elseif ( isset( $this->mParams['notice'] ) ) {
-			$notices[] = $this->mParams['notice'];
-		}
-
-		return $notices;
-	}
-
 	/**
 	 * @return string HTML
 	 */