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

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