From: Alexia E. Smith <washuu@gmail.com>
Date: Tue, 10 Apr 2018 22:20:20 +0000 (-0500)
Subject: preferences: Preserve Status from saveFormData() in submitForm()
X-Git-Tag: 1.34.0-rc.0~5247^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/File:Foobar.jpg?a=commitdiff_plain;h=7b2182d9e57ff9c3d516ecad0e7338fb866712e8;p=lhc%2Fweb%2Fwiklou.git

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
---

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 );
 	}
 
 	/**