Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

installer: Choose CACHE_ACCEL as the default if available

Browse source 
Bug: T49162
Change-Id: I57c8887c00cb3b73367e6733af1bf93dbab0c639
This commit is contained in:
saper 2015-10-24 00:44:32 +02:00 committed by Kunal Mehta
parent e5b598c0cf
commit b3dc2fedc5
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.27
View file

@ -99,6 +99,8 @@ production.
* Added a new hook, 'TitleMoveCompleting', which runs before a page move is committed.
* $wgCdnReboundPurgeDelay was added to provide secondary delayed purges of URLs
from CDN to mitigate DB replication lag and WAN cache purge lag.
* (T49162) Installer will default to setting CACHE_ACCEL as the main cache type
if it is available.
=== External library changes in 1.27 ===
==== Upgraded external libraries ====

6
includes/installer/WebInstallerPage.php
View file

@ -1134,8 +1134,12 @@ class WebInstallerOptions extends WebInstallerPage {
);
$caches = array( 'none' );
$cachevalDefault = 'none';
if ( count( $this->getVar( '_Caches' ) ) ) {
// A CACHE_ACCEL implementation is available
$caches[] = 'accel';
$cachevalDefault = 'accel';
}
$caches[] = 'memcached';
@ -1145,7 +1149,7 @@ class WebInstallerOptions extends WebInstallerPage {
// We need to set a default here; but don't hardcode it
// or we lose it every time we reload the page for validation
// or going back!
$cacheval = 'none';
$cacheval = $cachevalDefault;
}
$hidden = ( $cacheval == 'memcached' ) ? '' : 'display: none';
$this->addHTML(