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 "registration: Avoid redundant LBYL check in ExtensionRegistry::queue()"
[lhc/web/wiklou.git]
/
includes
/
preferences
/
DefaultPreferencesFactory.php
diff --git
a/includes/preferences/DefaultPreferencesFactory.php
b/includes/preferences/DefaultPreferencesFactory.php
index
8c44a5e
..
8a82add
100644
(file)
--- a/
includes/preferences/DefaultPreferencesFactory.php
+++ b/
includes/preferences/DefaultPreferencesFactory.php
@@
-1586,12
+1586,11
@@
class DefaultPreferencesFactory implements PreferencesFactory {
* Handle the form submission if everything validated properly
*
* @param array $formData
* Handle the form submission if everything validated properly
*
* @param array $formData
- * @param
HTMLForm
$form
+ * @param
PreferencesFormOOUI
$form
* @param array[] $formDescriptor
* @return bool|Status|string
*/
* @param array[] $formDescriptor
* @return bool|Status|string
*/
- protected function saveFormData( $formData, HTMLForm $form, array $formDescriptor ) {
- /** @var \User $user */
+ protected function saveFormData( $formData, PreferencesFormOOUI $form, array $formDescriptor ) {
$user = $form->getModifiedUser();
$hiddenPrefs = $this->options->get( 'HiddenPrefs' );
$result = true;
$user = $form->getModifiedUser();
$hiddenPrefs = $this->options->get( 'HiddenPrefs' );
$result = true;
@@
-1689,11
+1688,15
@@
class DefaultPreferencesFactory implements PreferencesFactory {
* Save the form data and reload the page
*
* @param array $formData
* Save the form data and reload the page
*
* @param array $formData
- * @param
HTMLForm
$form
+ * @param
PreferencesFormOOUI
$form
* @param array $formDescriptor
* @return Status
*/
* @param array $formDescriptor
* @return Status
*/
- protected function submitForm( array $formData, HTMLForm $form, array $formDescriptor ) {
+ protected function submitForm(
+ array $formData,
+ PreferencesFormOOUI $form,
+ array $formDescriptor
+ ) {
$res = $this->saveFormData( $formData, $form, $formDescriptor );
if ( $res === true ) {
$res = $this->saveFormData( $formData, $form, $formDescriptor );
if ( $res === true ) {