dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Improve HTMLSubmitField return value"
[lhc/web/wiklou.git]
/
includes
/
htmlform
/
HTMLForm.php
diff --git
a/includes/htmlform/HTMLForm.php
b/includes/htmlform/HTMLForm.php
index
1cc41f7
..
2b6a0aa
100644
(file)
--- 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 ) {
foreach ( $fields as $key => $value ) {
if ( $value instanceof HTMLFormField ) {
- $v =
empty( $value->mParams['nodata'
] )
+ $v =
isset( $this->mFieldData[$key
] )
? $this->mFieldData[$key]
: $value->getDefault();
? $this->mFieldData[$key]
: $value->getDefault();
@@
-1600,12
+1600,13
@@
class HTMLForm extends ContextSource {
$fieldData = [];
foreach ( $this->mFlatFields as $fieldname => $field ) {
$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 {
continue;
} elseif ( !empty( $field->mParams['disabled'] ) ) {
$fieldData[$fieldname] = $field->getDefault();
} else {
- $fieldData[$fieldname] = $field->loadDataFromRequest( $
this->getRequest()
);
+ $fieldData[$fieldname] = $field->loadDataFromRequest( $
request
);
}
}
}
}