From: Marcin Cieślak <saper@users.mediawiki.org>
Date: Mon, 12 Mar 2012 19:58:27 +0000 (+0000)
Subject: Revert r113619, r113649: Breaks unit tests
X-Git-Tag: 1.31.0-rc.0~24285
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=f65f4456b2d03122bf9422a3a8a9292967402246;p=lhc%2Fweb%2Fwiklou.git

Revert r113619, r113649: Breaks unit tests

https://integration.mediawiki.org/ci/job/MediaWiki-postgres-phpunit/3210/console

Maybe a new property with unpredictable
value breaks some tests. Need to investigate.
---

diff --git a/includes/User.php b/includes/User.php
index 997e6942a3..b0b26ef77a 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2880,7 +2880,6 @@ class User {
 			'user_token' => $user->mToken,
 			'user_registration' => $dbw->timestamp( $user->mRegistration ),
 			'user_editcount' => 0,
-			'user_touched' => self::newTouchedTimestamp(),
 		);
 		foreach ( $params as $name => $value ) {
 			$fields["user_$name"] = $value;
@@ -2899,9 +2898,6 @@ class User {
 	 */
 	public function addToDatabase() {
 		$this->load();
-
-		$this->mTouched = self::newTouchedTimestamp();
-
 		$dbw = wfGetDB( DB_MASTER );
 		$seqVal = $dbw->nextSequenceValue( 'user_user_id_seq' );
 		$dbw->insert( 'user',
@@ -2917,7 +2913,6 @@ class User {
 				'user_token' => $this->mToken,
 				'user_registration' => $dbw->timestamp( $this->mRegistration ),
 				'user_editcount' => 0,
-				'user_touched' => $dbw->timestamp( $this->mTouched ),
 			), __METHOD__
 		);
 		$this->mId = $dbw->insertId();