Merge "Make JobQueueRedis stat calls match the DB one"

[lhc/web/wiklou.git] / includes / installer / Installer.php

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index f426081..064bd6d 100644 (file)
--- 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';
@@ -1750,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() );
                }