diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 379ef0f501a..f135a9e900e 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -2036,7 +2036,7 @@ class HTMLForm extends ContextSource {
 		# Filter data.
 		foreach ( $fieldData as $name => &$value ) {
 			$field = $this->mFlatFields[$name];
-			$value = $field->filter( $value, $this->mFlatFields );
+			$value = $field->filter( $value, $fieldData );
 		}
 
 		$this->mFieldData = $fieldData;
diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index 746cddb50e3..4c9c518e993 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -353,7 +353,7 @@ abstract class HTMLFormField {
 	 * @stable to override
 	 *
 	 * @param mixed $value
-	 * @param HTMLFormField[] $alldata
+	 * @param mixed[] $alldata
 	 *
 	 * @return mixed
 	 */