From 350b138a7d3dbce7e75d9f8773c65ec046b2d240 Mon Sep 17 00:00:00 2001 From: "Aleksey Bekh-Ivanov (WMDE)" Date: Wed, 15 Mar 2017 19:26:55 +0000 Subject: [PATCH] Revert "Default to CACHE_ACCEL if user skips advanced settings" This reverts commit 1fec847c6b366ab21bb215b94837a186545096f4. Bug: T160519 Change-Id: I3bbfb5c5b61b8587ddc4af4fa134de6c86f46d98 --- includes/installer/LocalSettingsGenerator.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index dde4daa305..697188ef08 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -65,7 +65,6 @@ class LocalSettingsGenerator { '_MemCachedServers', 'wgDBserver', 'wgDBuser', 'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin', 'wgMetaNamespace', 'wgLogo', 'wgAuthenticationTokenVersion', 'wgPingback', - '_Caches', ], $db->getGlobalNames() ); @@ -294,17 +293,11 @@ class LocalSettingsGenerator { case 'db': case 'memcached': case 'accel': - case 'none': $cacheType = 'CACHE_' . strtoupper( $this->values['_MainCacheType'] ); break; + case 'none': default: - // If the user skipped the options page, - // default to CACHE_ACCEL if available - if ( count( $this->values['_Caches'] ) ) { - $cacheType = 'CACHE_ACCEL'; - } else { - $cacheType = 'CACHE_NONE'; - } + $cacheType = 'CACHE_NONE'; } $mcservers = $this->buildMemcachedServerList(); -- 2.20.1