Index: trunk/phase3/includes/installer/Installer.i18n.php |
— | — | @@ -406,8 +406,6 @@ |
407 | 407 | No functionality is removed, but speed may be impacted.', |
408 | 408 | 'config-cache-accel' => 'PHP object caching (APC, eAccelerator, XCache or WinCache)', |
409 | 409 | 'config-cache-memcached' => 'Use Memcached (requires additional setup and configuration)', |
410 | | - 'config-cache-db' => 'Cache data into the database', |
411 | | - 'config-cache-anything' => 'MediaWiki will attempt to cache data anywhere possible, except in Memcached, unless indicated explicitely', |
412 | 410 | 'config-memcached-servers' => 'Memcached servers:', |
413 | 411 | 'config-memcached-help' => 'List of IP addresses to use for Memcached. |
414 | 412 | Should be separated with commas and specify the port to be used (for example: 1.2.3.4:56, 7.8.9.10:11).', |
Index: trunk/phase3/includes/installer/WebInstaller.php |
— | — | @@ -1406,8 +1406,7 @@ |
1407 | 1407 | $this->parent->getFieldsetEnd() |
1408 | 1408 | ); |
1409 | 1409 | |
1410 | | - $caches = array( 'none', 'anything', 'db' ); |
1411 | | - $selected = 'db'; |
| 1410 | + $caches = array( 'none' ); |
1412 | 1411 | if( count( $this->getVar( '_Caches' ) ) ) { |
1413 | 1412 | $caches[] = 'accel'; |
1414 | 1413 | $selected = 'accel'; |