From fdd0e32d02fa78e3012d17eb049d4f4871a7f1b3 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 28 Nov 2010 22:44:14 +0000
Subject: [PATCH] =?utf8?q?Use=20always=20DatabaseBase::timestampoOrNull=20?=
 =?utf8?q?for=20user=5Fnewpass=5Ftime=20field,=20as=20done=20in=20loadFrom?=
 =?utf8?q?Row()/saveSettings()=20--=20l=C3=ADnea=20y=20las=20que=20est?=
 =?utf8?q?=C3=A1n=20debajo=20ser=C3=A1n=20ignoradas--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

M    User.php
---
 includes/User.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index 528dde1b05..7e77986157 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2573,12 +2573,13 @@ class User {
 		}
 		$dbw = wfGetDB( DB_MASTER );
 		$seqVal = $dbw->nextSequenceValue( 'user_user_id_seq' );
+
 		$fields = array(
 			'user_id' => $seqVal,
 			'user_name' => $name,
 			'user_password' => $user->mPassword,
 			'user_newpassword' => $user->mNewpassword,
-			'user_newpass_time' => $dbw->timestamp( $user->mNewpassTime ),
+			'user_newpass_time' => $dbw->timestampOrNull( $user->mNewpassTime ),
 			'user_email' => $user->mEmail,
 			'user_email_authenticated' => $dbw->timestampOrNull( $user->mEmailAuthenticated ),
 			'user_real_name' => $user->mRealName,
@@ -2612,7 +2613,7 @@ class User {
 				'user_name' => $this->mName,
 				'user_password' => $this->mPassword,
 				'user_newpassword' => $this->mNewpassword,
-				'user_newpass_time' => $dbw->timestamp( $this->mNewpassTime ),
+				'user_newpass_time' => $dbw->timestampOrNull( $this->mNewpassTime ),
 				'user_email' => $this->mEmail,
 				'user_email_authenticated' => $dbw->timestampOrNull( $this->mEmailAuthenticated ),
 				'user_real_name' => $this->mRealName,
-- 
2.20.1