From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 1 Jul 2010 13:43:05 +0000 (+0000)
Subject: Followup r63389: remove useless CACHE_DB and confusing CACHE_ANYTHING from cache... 
X-Git-Tag: 1.31.0-rc.0~36320
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=32fec7e241bf60b657c18b0c1dea83f147566ea1;p=lhc%2Fweb%2Fwiklou.git

Followup r63389: remove useless CACHE_DB and confusing CACHE_ANYTHING from cache setup
---

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index d624532395..ab9a0c3fcc 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -406,8 +406,6 @@ Medium to large sites are highly encouraged to enable this, and small sites will
 No functionality is removed, but speed may be impacted.',
 	'config-cache-accel'              => 'PHP object caching (APC, eAccelerator, XCache or WinCache)',
 	'config-cache-memcached'          => 'Use Memcached (requires additional setup and configuration)',
-	'config-cache-db'                 => 'Cache data into the database',
-	'config-cache-anything'           => 'MediaWiki will attempt to cache data anywhere possible, except in Memcached, unless indicated explicitely',
 	'config-memcached-servers'        => 'Memcached servers:',
 	'config-memcached-help'           => 'List of IP addresses to use for Memcached.
 Should be separated with commas and specify the port to be used (for example: 1.2.3.4:56, 7.8.9.10:11).',
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 7d81de962c..5b17d0b5a0 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1406,8 +1406,7 @@ class WebInstaller_Options extends WebInstallerPage {
 			$this->parent->getFieldsetEnd()
 		);
 
-		$caches = array( 'none', 'anything', 'db' );
-		$selected = 'db';
+		$caches = array( 'none' );
 		if( count( $this->getVar( '_Caches' ) ) ) {
 			$caches[] = 'accel';
 			$selected = 'accel';