From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Fri, 22 Jan 2016 17:49:06 +0000 (-0500)
Subject: User: Fix loading of user_touched
X-Git-Tag: 1.31.0-rc.0~8250
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=92ba9fa33df3dc6d76dbc7e09eddd3e7da3f3b75;p=lhc%2Fweb%2Fwiklou.git

User: Fix loading of user_touched

Always load user_touched from the row if present, don't gate it on
user_email being non-null.

Bug: T124414
Change-Id: I68fcbb560ddfa349b83126298534161971a88871
---

diff --git a/includes/user/User.php b/includes/user/User.php
index 3a20f1f6ea..47e67e5601 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1251,9 +1251,14 @@ class User implements IDBAccessObject {
 			$all = false;
 		}
 
+		if ( isset( $row->user_touched ) ) {
+			$this->mTouched = wfTimestamp( TS_MW, $row->user_touched );
+		} else {
+			$all = false;
+		}
+
 		if ( isset( $row->user_email ) ) {
 			$this->mEmail = $row->user_email;
-			$this->mTouched = wfTimestamp( TS_MW, $row->user_touched );
 			$this->mToken = $row->user_token;
 			if ( $this->mToken == '' ) {
 				$this->mToken = null;