From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Thu, 27 Mar 2008 21:50:04 +0000 (+0000)
Subject: Use database's timestampOrNull(), not the global one, as we're writing the values... 
X-Git-Tag: 1.31.0-rc.0~48765
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=4cf4172c149f5977fb9af0f78c02ec5de4905448;p=lhc%2Fweb%2Fwiklou.git

Use database's timestampOrNull(), not the global one, as we're writing the values back to the DB.
---

diff --git a/includes/User.php b/includes/User.php
index c64145c201..765f29f00d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -792,15 +792,15 @@ class User {
 			$this->mRealName = $s->user_real_name;
 			$this->mPassword = $s->user_password;
 			$this->mNewpassword = $s->user_newpassword;
-			$this->mNewpassTime = wfTimestampOrNull( TS_MW, $s->user_newpass_time );
+			$this->mNewpassTime = $dbr->timestampOrNull( $s->user_newpass_time );
 			$this->mEmail = $s->user_email;
 			$this->decodeOptions( $s->user_options );
-			$this->mTouched = wfTimestamp(TS_MW,$s->user_touched);
+			$this->mTouched = $dbr->timestamp( $s->user_touched );
 			$this->mToken = $s->user_token;
-			$this->mEmailAuthenticated = wfTimestampOrNull( TS_MW, $s->user_email_authenticated );
+			$this->mEmailAuthenticated = $dbr->timestampOrNull( $s->user_email_authenticated );
 			$this->mEmailToken = $s->user_email_token;
-			$this->mEmailTokenExpires = wfTimestampOrNull( TS_MW, $s->user_email_token_expires );
-			$this->mRegistration = wfTimestampOrNull( TS_MW, $s->user_registration );
+			$this->mEmailTokenExpires = $dbr->timestampOrNull( $s->user_email_token_expires );
+			$this->mRegistration = $dbr->timestampOrNull( $s->user_registration );
 			$this->mEditCount = $s->user_editcount; 
 			$this->getEditCount(); // revalidation for nulls