From: Bryan Davis <bd808@wikimedia.org>
Date: Fri, 22 Aug 2014 15:55:59 +0000 (-0600)
Subject: Ensure that expiry times are given as integers
X-Git-Tag: 1.31.0-rc.0~14323^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/Boston?a=commitdiff_plain;h=d7c8c3446dabad043fc9e62f6e0151233e31e017;p=lhc%2Fweb%2Fwiklou.git

Ensure that expiry times are given as integers

Fixes "Fatal error: Argument 4 passed to Memcached::cas() must be an
instance of int, float given".

Change-Id: Ibf1ea638ec1a4dcf009cdaea8aa66008c74ff30b
---

diff --git a/includes/objectcache/MemcachedBagOStuff.php b/includes/objectcache/MemcachedBagOStuff.php
index 59191d76c1..54a464de00 100644
--- a/includes/objectcache/MemcachedBagOStuff.php
+++ b/includes/objectcache/MemcachedBagOStuff.php
@@ -154,7 +154,7 @@ class MemcachedBagOStuff extends BagOStuff {
 		if ( $expiry > 2592000 && $expiry < 1000000000 ) {
 			$expiry = 2592000;
 		}
-		return $expiry;
+		return (int) $expiry;
 	}
 
 	/**