From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 28 Mar 2008 00:48:40 +0000 (+0000)
Subject: Revert r32525 -- general processing should use TS_MW format consistently.
X-Git-Tag: 1.31.0-rc.0~48759
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=bdee5a4f1a11c97e20c378420b154e4a91c2e9f0;p=lhc%2Fweb%2Fwiklou.git

Revert r32525 -- general processing should use TS_MW format consistently.
$db->timestamp() & $db->timestampOrNull() are to be used at the border between general processing and database access.
---

diff --git a/includes/User.php b/includes/User.php
index 765f29f00d..c64145c201 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 = $dbr->timestampOrNull( $s->user_newpass_time );
+			$this->mNewpassTime = wfTimestampOrNull( TS_MW, $s->user_newpass_time );
 			$this->mEmail = $s->user_email;
 			$this->decodeOptions( $s->user_options );
-			$this->mTouched = $dbr->timestamp( $s->user_touched );
+			$this->mTouched = wfTimestamp(TS_MW,$s->user_touched);
 			$this->mToken = $s->user_token;
-			$this->mEmailAuthenticated = $dbr->timestampOrNull( $s->user_email_authenticated );
+			$this->mEmailAuthenticated = wfTimestampOrNull( TS_MW, $s->user_email_authenticated );
 			$this->mEmailToken = $s->user_email_token;
-			$this->mEmailTokenExpires = $dbr->timestampOrNull( $s->user_email_token_expires );
-			$this->mRegistration = $dbr->timestampOrNull( $s->user_registration );
+			$this->mEmailTokenExpires = wfTimestampOrNull( TS_MW, $s->user_email_token_expires );
+			$this->mRegistration = wfTimestampOrNull( TS_MW, $s->user_registration );
 			$this->mEditCount = $s->user_editcount; 
 			$this->getEditCount(); // revalidation for nulls