Merge "preferences: Preserve Status from saveFormData() in submitForm()"

diff --combined includes/preferences/DefaultPreferencesFactory.php
index eb94ff1,df325a7..62973d9
--- 1/includes/preferences/DefaultPreferencesFactory.php
--- 2/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@@ -45,7 -45,8 +45,7 @@@ use MWTimestamp
  use OutputPage;
  use Parser;
  use ParserOptions;
 -use PreferencesForm;
 -use PreferencesFormOOUI;
 +use PreferencesFormLegacy;
  use Psr\Log\LoggerAwareTrait;
  use Psr\Log\NullLogger;
  use Skin;
@@@ -1483,12 -1484,12 +1483,12 @@@ class DefaultPreferencesFactory impleme
         * @param IContextSource $context
         * @param string $formClass
         * @param array $remove Array of items to remove
 -       * @return PreferencesForm
 +       * @return HTMLForm
         */
        public function getForm(
                User $user,
                IContextSource $context,
 -              $formClass = PreferencesFormOOUI::class,
 +              $formClass = PreferencesFormLegacy::class,
                array $remove = []
        ) {
                if ( SpecialPreferences::isOouiEnabled( $context ) ) {
@@@ -1510,7 -1511,7 +1510,7 @@@
                }
  
                /**
 -               * @var $htmlForm PreferencesForm
 +               * @var $htmlForm HTMLForm
                 */
                $htmlForm = new $formClass( $formDescriptor, $context, 'prefs' );
  
@@@ -1521,7 -1522,7 +1521,7 @@@
                # Used message keys: 'accesskey-preferences-save', 'tooltip-preferences-save'
                $htmlForm->setSubmitTooltip( 'preferences-save' );
                $htmlForm->setSubmitID( 'prefcontrol' );
 -              $htmlForm->setSubmitCallback( function ( array $formData, PreferencesForm $form ) {
 +              $htmlForm->setSubmitCallback( function ( array $formData, HTMLForm $form ) {
                        return $this->submitForm( $formData, $form );
                } );
  
@@@ -1626,10 -1627,10 +1626,10 @@@
         * Handle the form submission if everything validated properly
         *
         * @param array $formData
 -       * @param PreferencesForm $form
 +       * @param HTMLForm $form
         * @return bool|Status|string
         */
 -      protected function saveFormData( $formData, PreferencesForm $form ) {
 +      protected function saveFormData( $formData, HTMLForm $form ) {
                $user = $form->getModifiedUser();
                $hiddenPrefs = $this->config->get( 'HiddenPrefs' );
                $result = true;
@@@ -1706,10 -1707,10 +1706,10 @@@
         * @deprecated since 1.31, its inception
         *
         * @param array $formData
 -       * @param PreferencesForm $form
 +       * @param HTMLForm $form
         * @return bool|Status|string
         */
 -      public function legacySaveFormData( $formData, PreferencesForm $form ) {
 +      public function legacySaveFormData( $formData, HTMLForm $form ) {
                return $this->saveFormData( $formData, $form );
        }
  
@@@ -1717,15 -1718,14 +1717,14 @@@
         * 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' ) {
@@@ -1749,7 -1749,7 +1748,7 @@@
                        $context->getOutput()->redirect( $url );
                }
  
-               return Status::newGood();
+               return ( $res === true ? Status::newGood() : $res );
        }
  
        /**
@@@ -1758,10 -1758,10 +1757,10 @@@
         * @deprecated since 1.31, its inception
         *
         * @param array $formData
 -       * @param PreferencesForm $form
 +       * @param HTMLForm $form
         * @return Status
         */
 -      public function legacySubmitForm( array $formData, PreferencesForm $form ) {
 +      public function legacySubmitForm( array $formData, HTMLForm $form ) {
                return $this->submitForm( $formData, $form );
        }