From 7b2182d9e57ff9c3d516ecad0e7338fb866712e8 Mon Sep 17 00:00:00 2001 From: "Alexia E. Smith" Date: Tue, 10 Apr 2018 17:20:20 -0500 Subject: [PATCH] preferences: Preserve Status from saveFormData() in submitForm() The old Preference::tryUISubmit() and the new submitForm() would blissfully return Status::newGood(), even when it isn't good. Bug: T191933 Change-Id: I4e35c5a71800f88b2063dd0361d83a56f54d58c3 --- includes/preferences/DefaultPreferencesFactory.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index d5a706afc4..df325a76d7 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -1724,9 +1724,8 @@ class DefaultPreferencesFactory implements PreferencesFactory { protected function submitForm( array $formData, PreferencesForm $form ) { $res = $this->saveFormData( $formData, $form ); - if ( $res ) { + if ( $res === true ) { $context = $form->getContext(); - $urlOptions = []; if ( $res === 'eauth' ) { @@ -1750,7 +1749,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { $context->getOutput()->redirect( $url ); } - return Status::newGood(); + return ( $res === true ? Status::newGood() : $res ); } /** -- 2.20.1