From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 10 Jun 2015 01:47:49 +0000 (-0700)
Subject: Fixed "wfTimestamp() fed bogus time value" errors
X-Git-Tag: 1.31.0-rc.0~11132
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=fd5bde60ec5e029a1e3c9a5b12edf636b03d7574;p=lhc%2Fweb%2Fwiklou.git

Fixed "wfTimestamp() fed bogus time value" errors

* This broke OutputPage::checkLastModified() as the touched time was false

Change-Id: I118d3ddf07c7b69ad269f3aee0c70ab4159df192
---

diff --git a/includes/User.php b/includes/User.php
index bf0326a0cd..61313a3964 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2362,7 +2362,7 @@ class User implements IDBAccessObject {
 
 				$timestamp = $cache->getCheckKeyTime( $key );
 				if ( $timestamp ) {
-					$this->mQuickTouched = wfTimestamp( TS_MW, $timestamp );
+					$this->mQuickTouched = wfTimestamp( TS_MW, (int)$timestamp );
 				} else {
 					# Set the timestamp to get HTTP 304 cache hits
 					$this->touch();