X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=064bd6df4feddbf813997337674a429ee8175895;hb=a759297ac827f87a31c28e2623541788ef55b7a5;hp=d98ca797eaa721ecd464bd6726c0df81698ce639;hpb=831fdbea370609f19c0527ddf13bfad49aa89672;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index d98ca797ea..064bd6df4f 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -370,12 +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,
-		);
+		) + $GLOBALS['wgObjectCaches'];
 
 		// Load the installer's i18n.
 		$wgMessagesDirs['MediawikiInstaller'] = __DIR__ . '/i18n';
@@ -1748,7 +1750,7 @@ abstract class Installer {
 				User::newFromName( 'MediaWiki default' )
 			);
 		} catch ( Exception $e ) {
-			//using raw, because $wgShowExceptionDetails can not be set yet
+			// using raw, because $wgShowExceptionDetails can not be set yet
 			$status->fatal( 'config-install-mainpage-failed', $e->getMessage() );
 		}