From 1187d3eeecc62a8a31cbe52ad9ebeaa1a5588a1e Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 8 Jun 2011 00:53:56 +0000
Subject: [PATCH] Revert r87145, bug 28752: Xcache doesn't work in cli mode. As
 pointed out on CR, this didn't fix it, it just hid the issue.

---
 RELEASE-NOTES-1.18                       |  1 -
 includes/objectcache/XCacheBagOStuff.php | 23 ++---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 4bb8a93ea2..9afb57b0b0 100644
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -246,7 +246,6 @@ production.
   left-to-right.
 * (bug 28719) Do not call mLinkHolders __destruct explicitly
 * (bug 21196) Article::getContributors() no longer fails on PostgreSQL.
-* (bug 28752) XCache doesn't work in CLI mode.
 * (bug 28076) Thumbnail height limited to 360 pixels on Special:Listfiles
 * (bug 22227) Special:Listfiles no longer throws an error on bogus file entries
 * (bug 19408) user_properties.up_property: 32 bytes is not enough.
diff --git a/includes/objectcache/XCacheBagOStuff.php b/includes/objectcache/XCacheBagOStuff.php
index 6561a5f6a5..0ddf12456e 100644
--- a/includes/objectcache/XCacheBagOStuff.php
+++ b/includes/objectcache/XCacheBagOStuff.php
@@ -7,18 +7,6 @@
  * @ingroup Cache
  */
 class XCacheBagOStuff extends BagOStuff {
-	/**
-	 * Are we operating in CLI mode? Since xcache doesn't work then and they 
-	 * don't want to change that
-	 * @see bug 28752
-	 * @var bool
-	 */
-	private $isCli = false;
-
-	public function __construct() {
-		$this->isCli = php_sapi_name() == 'cli';
-	}
-
 	/**
 	 * Get a value from the XCache object cache
 	 *
@@ -26,9 +14,6 @@ class XCacheBagOStuff extends BagOStuff {
 	 * @return mixed
 	 */
 	public function get( $key ) {
-		if( $this->isCli ) {
-			return false;
-		}
 		$val = xcache_get( $key );
 
 		if ( is_string( $val ) ) {
@@ -47,9 +32,7 @@ class XCacheBagOStuff extends BagOStuff {
 	 * @return bool
 	 */
 	public function set( $key, $value, $expire = 0 ) {
-		if( !$this->isCli ) {
-			xcache_set( $key, serialize( $value ), $expire );
-		}
+		xcache_set( $key, serialize( $value ), $expire );
 		return true;
 	}
 
@@ -61,9 +44,7 @@ class XCacheBagOStuff extends BagOStuff {
 	 * @return bool
 	 */
 	public function delete( $key, $time = 0 ) {
-		if( !$this->isCli ) {
-			xcache_unset( $key );
-		}
+		xcache_unset( $key );
 		return true;
 	}
 }
-- 
2.20.1