Merge "Revert "Default to CACHE_ACCEL if user skips advanced settings""

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index dde4daa..697188e 100644 (file)
--- 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();