X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fhtmlform%2FHTMLForm.php;h=2b6a0aa4fb915734a2a2a3bc4961493f2b7ed86e;hb=cc991d3cb0cb17c8532d4970c7f50cb1250c7ebe;hp=1cc41f72222a73f99982fbc5dae16684b6e1592a;hpb=31e6f7ce134c79c7502f7480d698f74b03e9a169;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 1cc41f7222..2b6a0aa4fb 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -1491,7 +1491,7 @@ class HTMLForm extends ContextSource {
 
 		foreach ( $fields as $key => $value ) {
 			if ( $value instanceof HTMLFormField ) {
-				$v = empty( $value->mParams['nodata'] )
+				$v = isset( $this->mFieldData[$key] )
 					? $this->mFieldData[$key]
 					: $value->getDefault();
 
@@ -1600,12 +1600,13 @@ class HTMLForm extends ContextSource {
 		$fieldData = [];
 
 		foreach ( $this->mFlatFields as $fieldname => $field ) {
-			if ( !empty( $field->mParams['nodata'] ) ) {
+			$request = $this->getRequest();
+			if ( $field->skipLoadData( $request ) ) {
 				continue;
 			} elseif ( !empty( $field->mParams['disabled'] ) ) {
 				$fieldData[$fieldname] = $field->getDefault();
 			} else {
-				$fieldData[$fieldname] = $field->loadDataFromRequest( $this->getRequest() );
+				$fieldData[$fieldname] = $field->loadDataFromRequest( $request );
 			}
 		}