From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 6 Oct 2008 23:57:05 +0000 (+0000)
Subject: (bug 10250) New password submission oddness for empty passwords
X-Git-Tag: 1.31.0-rc.0~44860
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=ccc8f76e3cbef71f665cf6644a39528290bddf8d;p=lhc%2Fweb%2Fwiklou.git

(bug 10250) New password submission oddness for empty passwords
---

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index ca1e3d33bd..ea98e00197 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -135,7 +135,7 @@ class PreferencesForm {
 		global $wgAuth, $wgEmailConfirmToEdit;
 
 
-		if ( '' != $this->mNewpass && $wgAuth->allowPasswordChange() ) {
+		if ( ($this->mNewpass !== '' || $this->mOldpass !== '' ) && $wgAuth->allowPasswordChange() ) {
 			if ( $this->mNewpass != $this->mRetypePass ) {
 				wfRunHooks( 'PrefsPasswordAudit', array( $wgUser, $this->mNewpass, 'badretype' ) );
 				$this->mainPrefsForm( 'error', wfMsg( 'badretype' ) );