Merge "Password validity by policy per group"

[lhc/web/wiklou.git] / includes / User.php

diff --git a/includes/User.php b/includes/User.php
index bdfa030..10763ea 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2341,7 +2341,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();