Merge "preferences: Preserve Status from saveFormData() in submitForm()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 May 2018 19:24:42 +0000 (19:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 30 May 2018 19:24:43 +0000 (19:24 +0000)
1  2 
includes/preferences/DefaultPreferencesFactory.php

@@@ -1717,15 -1718,14 +1717,14 @@@ class DefaultPreferencesFactory impleme
         * Save the form data and reload the page
         *
         * @param array $formData
 -       * @param PreferencesForm $form
 +       * @param HTMLForm $form
         * @return Status
         */
 -      protected function submitForm( array $formData, PreferencesForm $form ) {
 +      protected function submitForm( array $formData, HTMLForm $form ) {
                $res = $this->saveFormData( $formData, $form );
  
-               if ( $res ) {
+               if ( $res === true ) {
                        $context = $form->getContext();
                        $urlOptions = [];
  
                        if ( $res === 'eauth' ) {