X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPreferences.php;h=9f8c06b9bf964c6aea4b1d259ee8810557fcff8d;hb=08f0a91371e5e1c13a7357635c1094f899473645;hp=3083a8d2155820ef67e6ebb77fb7331800aa3e48;hpb=801db2a0e2be2b14a6f997b127b5880eade5cd2a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 3083a8d215..9f8c06b9bf 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -207,8 +207,9 @@ class Preferences {
 	 * @return void
 	 */
 	static function profilePreferences( $user, IContextSource $context, &$defaultPreferences ) {
-		global $wgAuth, $wgContLang, $wgParser, $wgDisableAuthManager;
+		global $wgContLang, $wgParser;
 
+		$authManager = AuthManager::singleton();
 		$config = $context->getConfig();
 		// retrieving user name for GENDER and misc.
 		$userName = $user->getName();
@@ -283,21 +284,19 @@ class Preferences {
 		$canEditPrivateInfo = $user->isAllowed( 'editmyprivateinfo' );
 
 		// Actually changeable stuff
-		$realnameChangeAllowed = $wgDisableAuthManager ? $wgAuth->allowPropChange( 'realname' )
-			: AuthManager::singleton()->allowsPropertyChange( 'realname' );
 		$defaultPreferences['realname'] = [
 			// (not really "private", but still shouldn't be edited without permission)
-			'type' => $canEditPrivateInfo && $realnameChangeAllowed ? 'text' : 'info',
+			'type' => $canEditPrivateInfo && $authManager->allowsPropertyChange( 'realname' )
+				? 'text' : 'info',
 			'default' => $user->getRealName(),
 			'section' => 'personal/info',
 			'label-message' => 'yourrealname',
 			'help-message' => 'prefs-help-realname',
 		];
 
-		$allowPasswordChange = $wgDisableAuthManager ? $wgAuth->allowPasswordChange()
-			: AuthManager::singleton()->allowsAuthenticationDataChange(
-				new PasswordAuthenticationRequest(), false )->isGood();
-		if ( $canEditPrivateInfo && $allowPasswordChange ) {
+		if ( $canEditPrivateInfo && $authManager->allowsAuthenticationDataChange(
+			new PasswordAuthenticationRequest(), false )->isGood()
+		) {
 			$link = Linker::link( SpecialPage::getTitleFor( 'ChangePassword' ),
 				$context->msg( 'prefs-resetpass' )->escaped(), [],
 				[ 'returnto' => SpecialPage::getTitleFor( 'Preferences' )->getPrefixedText() ] );
@@ -418,10 +417,8 @@ class Preferences {
 			'default' => $oldsigHTML,
 			'section' => 'personal/signature',
 		];
-		$nicknameChangeAllowed = $wgDisableAuthManager ? $wgAuth->allowPropChange( 'nickname' )
-			: AuthManager::singleton()->allowsPropertyChange( 'nickname' );
 		$defaultPreferences['nickname'] = [
-			'type' => $nicknameChangeAllowed ? 'text' : 'info',
+			'type' => $authManager->allowsPropertyChange( 'nickname' ) ? 'text' : 'info',
 			'maxlength' => $config->get( 'MaxSigChars' ),
 			'label-message' => 'yournick',
 			'validation-callback' => [ 'Preferences', 'validateSignature' ],
@@ -450,9 +447,7 @@ class Preferences {
 				}
 
 				$emailAddress = $user->getEmail() ? htmlspecialchars( $user->getEmail() ) : '';
-				$emailChangeAllowed = $wgDisableAuthManager ? $wgAuth->allowPropChange( 'emailaddress' )
-					: AuthManager::singleton()->allowsPropertyChange( 'emailaddress' );
-				if ( $canEditPrivateInfo && $emailChangeAllowed ) {
+				if ( $canEditPrivateInfo && $authManager->allowsPropertyChange( 'emailaddress' ) ) {
 					$link = Linker::link(
 						SpecialPage::getTitleFor( 'ChangeEmail' ),
 						$context->msg( $user->getEmail() ? 'prefs-changeemail' : 'prefs-setemail' )->escaped(),
@@ -1499,7 +1494,7 @@ class Preferences {
 
 			$context = $form->getContext();
 			// Set session data for the success message
-			$context->getRequest()->setSessionData( 'specialPreferencesSaveSuccess', 1 );
+			$context->getRequest()->getSession()->set( 'specialPreferencesSaveSuccess', 1 );
 
 			$context->getOutput()->redirect( $url );
 		}
@@ -1599,7 +1594,7 @@ class PreferencesForm extends HTMLForm {
 	 * Get extra parameters for the query string when redirecting after
 	 * successful save.
 	 *
-	 * @return array()
+	 * @return array
 	 */
 	public function getExtraSuccessRedirectParameters() {
 		return [];