From: Florian <florian.schmidt.stargatewissen@gmail.com>
Date: Sat, 26 Sep 2015 23:41:24 +0000 (+0200)
Subject: Don't overwrite all available object caches
X-Git-Tag: 1.31.0-rc.0~9710
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=caa637dd837a9bd073750e81a4e14d118c7b65bb;p=lhc%2Fweb%2Fwiklou.git

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
---

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';