dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4ae160a
)
Merge "ApiOptions: set form field parent earlier"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Wed, 4 May 2016 16:06:55 +0000
(16:06 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 4 May 2016 16:06:56 +0000
(16:06 +0000)
includes/api/ApiOptions.php
patch
|
blob
|
history
diff --git
a/includes/api/ApiOptions.php
b/includes/api/ApiOptions.php
index
e51d46d
..
8bfe447
100644
(file)
--- a/
includes/api/ApiOptions.php
+++ b/
includes/api/ApiOptions.php
@@
-86,8
+86,7
@@
class ApiOptions extends ApiBase {
// We need a dummy HTMLForm for the validate callback...
$htmlForm = new HTMLForm( [], $this );
}
- $field = HTMLForm::loadInputFromParameters( $key, $prefs[$key] );
- $field->mParent = $htmlForm;
+ $field = HTMLForm::loadInputFromParameters( $key, $prefs[$key], $htmlForm );
$validation = $field->validate( $value, $user->getOptions() );
break;
case 'registered-multiselect':