Unsetting the email address for a user when the email address is invalidated.

Change-Id: I2a8445745f04540e7962695c3116bb247d81fd94

diff --git a/includes/User.php b/includes/User.php
index d114b99..1312104 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2191,8 +2191,8 @@ class User {
                if ( $str == $this->mEmail ) {
                        return;
                }
-               $this->mEmail = $str;
                $this->invalidateEmail();
+               $this->mEmail = $str;
                wfRunHooks( 'UserSetEmail', array( $this, &$this->mEmail ) );
        }
 
@@ -3748,6 +3748,7 @@ class User {
                $this->mEmailToken = null;
                $this->mEmailTokenExpires = null;
                $this->setEmailAuthenticationTimestamp( null );
+               $this->mEmail = '';
                wfRunHooks( 'InvalidateEmailComplete', array( $this ) );
                return true;
        }