Index: trunk/phase3/includes/User.php |
— | — | @@ -792,15 +792,15 @@ |
793 | 793 | $this->mRealName = $s->user_real_name; |
794 | 794 | $this->mPassword = $s->user_password; |
795 | 795 | $this->mNewpassword = $s->user_newpassword; |
796 | | - $this->mNewpassTime = wfTimestampOrNull( TS_MW, $s->user_newpass_time ); |
| 796 | + $this->mNewpassTime = $dbr->timestampOrNull( $s->user_newpass_time ); |
797 | 797 | $this->mEmail = $s->user_email; |
798 | 798 | $this->decodeOptions( $s->user_options ); |
799 | | - $this->mTouched = wfTimestamp(TS_MW,$s->user_touched); |
| 799 | + $this->mTouched = $dbr->timestamp( $s->user_touched ); |
800 | 800 | $this->mToken = $s->user_token; |
801 | | - $this->mEmailAuthenticated = wfTimestampOrNull( TS_MW, $s->user_email_authenticated ); |
| 801 | + $this->mEmailAuthenticated = $dbr->timestampOrNull( $s->user_email_authenticated ); |
802 | 802 | $this->mEmailToken = $s->user_email_token; |
803 | | - $this->mEmailTokenExpires = wfTimestampOrNull( TS_MW, $s->user_email_token_expires ); |
804 | | - $this->mRegistration = wfTimestampOrNull( TS_MW, $s->user_registration ); |
| 803 | + $this->mEmailTokenExpires = $dbr->timestampOrNull( $s->user_email_token_expires ); |
| 804 | + $this->mRegistration = $dbr->timestampOrNull( $s->user_registration ); |
805 | 805 | $this->mEditCount = $s->user_editcount; |
806 | 806 | $this->getEditCount(); // revalidation for nulls |
807 | 807 | |