From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 8 Jul 2010 10:34:59 +0000 (+0000)
Subject: Followup r68831, r69170. Set none as the default cache always, never APC
X-Git-Tag: 1.31.0-rc.0~36210
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=792a026c165a09a7d4e775b3f02bcebcfd41228c;p=lhc%2Fweb%2Fwiklou.git

Followup r68831, r69170. Set none as the default cache always, never APC
---

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index b0be871d02..9ab7fdcfef 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1419,10 +1419,8 @@ class WebInstaller_Options extends WebInstallerPage {
 		);
 
 		$caches = array( 'none' );
-                $selected = $caches[0];
 		if( count( $this->getVar( '_Caches' ) ) ) {
 			$caches[] = 'accel';
-			$selected = 'accel';
 		}
 		$caches[] = 'memcached';
 
@@ -1435,7 +1433,7 @@ class WebInstaller_Options extends WebInstallerPage {
 				'label' => 'config-cache-options',
 				'itemLabelPrefix' => 'config-cache-',
 				'values' => $caches,
-				'value' => $selected,
+				'value' => 'none',
 			) ) .
 			$this->parent->getHelpBox( 'config-cache-help' ) .
 			'<div id="config-memcachewrapper">' .