From efa4652fcf8004413875debdc42524e80404323c Mon Sep 17 00:00:00 2001
From: Peter Gehres <pgehres@wikimedia.org>
Date: Wed, 1 May 2013 15:17:02 -0700
Subject: [PATCH] Unsetting the email address for a user when the email address
 is invalidated.

Change-Id: I2a8445745f04540e7962695c3116bb247d81fd94
---
 includes/User.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/User.php b/includes/User.php
index d114b994ef..1312104545 100644
--- 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;
 	}
-- 
2.20.1