From: Brent Garber <overlordq@gmail.com>
Date: Sat, 19 Jan 2013 03:43:03 +0000 (+0000)
Subject: (bug 44024) ObjectCache changes break XCache 3.x support
X-Git-Tag: 1.31.0-rc.0~20980^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=0072e0efeb8591a7761b3d573f8b71ef97fb96ec;p=lhc%2Fweb%2Fwiklou.git

(bug 44024) ObjectCache changes break XCache 3.x support

Changes in the 1.20.x branch altered the add method to check for the return value of get against
false.  Xcache 3.x returns NULL for unset values and so this check was erroneously determining that
all values are set when they were not.

This was causing basic ObjectCache usage to fail.

Change-Id: I0975e5c6a60c2813dc2d02aca84245807b8fb828
---

diff --git a/includes/objectcache/XCacheBagOStuff.php b/includes/objectcache/XCacheBagOStuff.php
index f740ae804f..2722e9c81a 100644
--- a/includes/objectcache/XCacheBagOStuff.php
+++ b/includes/objectcache/XCacheBagOStuff.php
@@ -44,6 +44,8 @@ class XCacheBagOStuff extends BagOStuff {
 			} else {
 				$val = unserialize( $val );
 			}
+		} elseif ( is_null( $val ) ) {
+			return false;
 		}
 
 		return $val;