(bug 10250) New password submission oddness for empty passwords

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index ca1e3d3..ea98e00 100644 (file)
--- 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' ) );