X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fobjectcache%2FXCacheBagOStuff.php;h=0f45db7348c779e77523174f6fc88dd01448fcbb;hb=b4cf6b43661d94c218f4fa6ab7dfc606378a08fc;hp=f740ae804f1c06fb3c7d0b57b11d57c37608b137;hpb=0e5f53d262825e0859c609e47c56d94665d33e90;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/objectcache/XCacheBagOStuff.php b/includes/objectcache/XCacheBagOStuff.php
index f740ae804f..0f45db7348 100644
--- a/includes/objectcache/XCacheBagOStuff.php
+++ b/includes/objectcache/XCacheBagOStuff.php
@@ -31,7 +31,7 @@ class XCacheBagOStuff extends BagOStuff {
 	/**
 	 * Get a value from the XCache object cache
 	 *
-	 * @param $key String: cache key
+	 * @param string $key cache key
 	 * @param $casToken mixed: cas token
 	 * @return mixed
 	 */
@@ -44,6 +44,8 @@ class XCacheBagOStuff extends BagOStuff {
 			} else {
 				$val = unserialize( $val );
 			}
+		} elseif ( is_null( $val ) ) {
+			return false;
 		}
 
 		return $val;
@@ -52,9 +54,9 @@ class XCacheBagOStuff extends BagOStuff {
 	/**
 	 * Store a value in the XCache object cache
 	 *
-	 * @param $key String: cache key
+	 * @param string $key cache key
 	 * @param $value Mixed: object to store
-	 * @param $expire Int: expiration time
+	 * @param int $expire expiration time
 	 * @return bool
 	 */
 	public function set( $key, $value, $expire = 0 ) {
@@ -81,8 +83,8 @@ class XCacheBagOStuff extends BagOStuff {
 	/**
 	 * Remove a value from the XCache object cache
 	 *
-	 * @param $key String: cache key
-	 * @param $time Int: not used in this implementation
+	 * @param string $key cache key
+	 * @param int $time not used in this implementation
 	 * @return bool
 	 */
 	public function delete( $key, $time = 0 ) {
@@ -97,8 +99,8 @@ class XCacheBagOStuff extends BagOStuff {
 	 *
 	 * @param $key string
 	 * @param $callback closure Callback method to be executed
-	 * @param $exptime int Either an interval in seconds or a unix timestamp for expiry
-	 * @param $attempts int The amount of times to attempt a merge in case of failure
+	 * @param int $exptime Either an interval in seconds or a unix timestamp for expiry
+	 * @param int $attempts The amount of times to attempt a merge in case of failure
 	 * @return bool success
 	 */
 	public function merge( $key, closure $callback, $exptime = 0, $attempts = 10 ) {