From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 29 Jul 2014 19:50:55 +0000 (+0000)
Subject: Merge "Unsetting the email address for a user when the email address is invalidated."
X-Git-Tag: 1.31.0-rc.0~14689
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22naviguer%22%29%20.%20%22?a=commitdiff_plain;h=1a8daf2c07e31337d83ee39b42873373023c8d40;hp=3a4f7df3e88117544f66066d462a2c8ab82525ed;p=lhc%2Fweb%2Fwiklou.git

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 b44e5e534b..bc06f979c8 100644
--- 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;
 	}