From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 23 Nov 2011 13:12:22 +0000 (+0000)
Subject: Followup r101507: don't automatically use APC for the localization cache if it is... 
X-Git-Tag: 1.31.0-rc.0~26333
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=3938e515ac93a662247e04deda9cffac47109105;p=lhc%2Fweb%2Fwiklou.git

Followup r101507: don't automatically use APC for the localization cache if it is available. I've expressed reservations in my CR comments (issues abound wherever maintenance scripts, server farms or manualRecache are involved), but the real reason is that three people (Siebrand on CR, Antoine/hashar in person and Rusty Burchfield on bug 32602) have reported problems with the APC LC, and had to set $wgLocalisationCacheConf['store'] = 'files'; explicitly to get LC to work again.
---

diff --git a/includes/LocalisationCache.php b/includes/LocalisationCache.php
index c44be13f70..1d0ccc5990 100644
--- a/includes/LocalisationCache.php
+++ b/includes/LocalisationCache.php
@@ -163,12 +163,7 @@ class LocalisationCache {
 					$storeClass = 'LCStore_Accel';
 					break;
 				case 'detect':
-					try {
-						$c = wfGetCache( CACHE_ACCEL );
-						$storeClass = 'LCStore_Accel';
-					} catch( Exception $c ) {
-						$storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB';
-					}
+					$storeClass = $wgCacheDirectory ? 'LCStore_CDB' : 'LCStore_DB';
 					break;
 				default:
 					throw new MWException(