From 1fd659cc5b4486ed6fdf8b42e5a38ac6e2832b6d Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 1 Nov 2011 16:51:31 +0000
Subject: [PATCH] Revert r101492, broken, see CR. Also revert followup r101496.

---
 includes/AutoLoader.php        |  1 -
 includes/LocalisationCache.php | 63 ++--------------------------------
 2 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 5ac74a1f3b..2f072121db 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -127,7 +127,6 @@ $wgAutoloadLocalClasses = array(
 	'IndexPager' => 'includes/Pager.php',
 	'Interwiki' => 'includes/interwiki/Interwiki.php',
 	'IP' => 'includes/IP.php',
-	'LCStore_Accel' => 'includes/LocalisationCache.php',
 	'LCStore_CDB' => 'includes/LocalisationCache.php',
 	'LCStore_DB' => 'includes/LocalisationCache.php',
 	'LCStore_Null' => 'includes/LocalisationCache.php',
diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php
index f5ac5c56ae..f76ae11a37 100644
--- a/includes/LocalisationCache.php
+++ b/includes/LocalisationCache.php
@@ -159,13 +159,8 @@ class LocalisationCache {
 				case 'db':
 					$storeClass = 'LCStore_DB';
 					break;
-				case 'accel':
 				case 'detect':
-					if ( !( wfGetCache( CACHE_ACCEL ) instanceof FakeMemCachedClient ) ) {
-						$storeClass = 'LCStore_Accel';
-					} else {
-						$storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB';
-					}
+					$storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB';
 					break;
 				default:
 					throw new MWException(
@@ -353,9 +348,7 @@ class LocalisationCache {
 		}
 
 		$deps = $this->store->get( $code, 'deps' );
-		$keys = $this->store->get( $code, 'list', 'messages' );
-		// 'list:messages' sometimes expires separately of 'deps' in LCStore_Accel
-		if ( $deps === null || $keys === null ) {
+		if ( $deps === null ) {
 			wfDebug( __METHOD__."($code): cache missing, need to make one\n" );
 			return true;
 		}
@@ -836,56 +829,6 @@ interface LCStore {
 	function set( $key, $value );
 }
 
-/**
- * LCStore implementation which uses PHP accelerator to store data.
- * This will work if one of XCache, eAccelerator, or APC cacher is configured.
- * (See ObjectCache.php)
- */
-class LCStore_Accel implements LCStore {
-	var $currentLang;
-	var $keys;
-
-	public function __construct() {
-		$this->cache = wfGetCache( CACHE_ACCEL );
-	}
-
-	public function get( $code, $key ) {
-		$k = wfMemcKey( 'l10n', $code, 'k', $key );
-		$r = $this->cache->get( $k );
-		if ( $r === false ) return null;
-		return $r;
-	}
-
-	public function startWrite( $code ) {
-		$k = wfMemcKey( 'l10n', $code, 'l' );
-		$keys = $this->cache->get( $k );
-		if ( $keys ) {
-			foreach ( $keys as $k ) {
-				$this->cache->delete( $k );
-			}
-		}
-		$this->currentLang = $code;
-		$this->keys = array();
-	}
-
-	public function finishWrite() {
-		if ( $this->currentLang ) {
-			$k = wfMemcKey( 'l10n', $this->currentLang, 'l' );
-			$this->cache->set( $k, array_keys( $this->keys ) );
-		}
-		$this->currentLang = null;
-		$this->keys = array();
-	}
-
-	public function set( $key, $value ) {
-		if ( $this->currentLang ) {
-			$k = wfMemcKey( 'l10n', $this->currentLang, 'k', $key );
-			$this->keys[$k] = true;
-			$this->cache->set( $k, $value );
-		}
-	}
-}
-
 /**
  * LCStore implementation which uses the standard DB functions to store data.
  * This will work on any MediaWiki installation.
@@ -1183,4 +1126,4 @@ class LocalisationCache_BulkLoad extends LocalisationCache {
 			$this->unload( $code );
 		}
 	}
-}
\ No newline at end of file
+}
-- 
2.20.1