From caa637dd837a9bd073750e81a4e14d118c7b65bb Mon Sep 17 00:00:00 2001 From: Florian Date: Sun, 27 Sep 2015 01:41:24 +0200 Subject: [PATCH] Don't overwrite all available object caches Just because some defined object caches are problematic in the installer, it doesn't mean, that all others are problematic, too. Disable only the object caches, which are known problematic ones by preserving the others. Follow up: I1c1938b3fac395d Bug: T113843 Change-Id: I951ef22d97b4c66d3b781a9bc4a30e7e2fca1395 --- includes/installer/Installer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 10dfa77e13..064bd6df4f 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -370,14 +370,14 @@ abstract class Installer { $GLOBALS['wgMemc'] = new EmptyBagOStuff; ObjectCache::clear(); $emptyCache = array( 'class' => 'EmptyBagOStuff' ); + // disable (problematic) object cache types explicitly, preserving all other (working) ones + // bug T113843 $GLOBALS['wgObjectCaches'] = array( CACHE_NONE => $emptyCache, CACHE_DB => $emptyCache, CACHE_ANYTHING => $emptyCache, CACHE_MEMCACHED => $emptyCache, - // Set hash object cache (e.g. used in ResourceLoader LESS caching) - bug T113843 - 'hash' => array( 'class' => 'HashBagOStuff' ), - ); + ) + $GLOBALS['wgObjectCaches']; // Load the installer's i18n. $wgMessagesDirs['MediawikiInstaller'] = __DIR__ . '/i18n'; -- 2.20.1