From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 30 May 2018 19:24:42 +0000 (+0000)
Subject: Merge "preferences: Preserve Status from saveFormData() in submitForm()"
X-Git-Tag: 1.34.0-rc.0~5247
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=402dd3cd82cd6295fe03b1b0bc78f6f38bbe8042;p=lhc%2Fweb%2Fwiklou.git

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

402dd3cd82cd6295fe03b1b0bc78f6f38bbe8042
diff --cc includes/preferences/DefaultPreferencesFactory.php
index eb94ff1f66,df325a76d7..62973d916b
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/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' ) {