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
This commit is contained in:
Brad Jorsch 2016-01-22 12:49:06 -05:00
parent a62a040563
commit 92ba9fa33d

View file

@ -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;