Index: branches/new-installer/phase3/maintenance/language/messages.inc
===================================================================
--- branches/new-installer/phase3/maintenance/language/messages.inc (revision 63388)
+++ branches/new-installer/phase3/maintenance/language/messages.inc (revision 63389)
@@ -3332,6 +3332,13 @@
'config-cc-again',
'config-cc-not-chosen',
'config-advanced-settings',
+ 'config-cache-settings',
+ 'config-cache-help',
+ 'config-cache-none',
+ 'config-cache-accel',
+ 'config-cache-memcached',
+ 'config-cache-db',
+ 'config-cache-anything',
'config-extensions',
'config-extensions-help',
'config-stage-done',
Index: branches/new-installer/phase3/includes/installer/WebInstaller.php
===================================================================
--- branches/new-installer/phase3/includes/installer/WebInstaller.php (revision 63388)
+++ branches/new-installer/phase3/includes/installer/WebInstaller.php (revision 63389)
@@ -1299,10 +1299,26 @@
'label' => 'config-logo'
) ) .
$this->parent->getHelpBox( 'config-logo-help' ) .
- $this->parent->getFieldsetEnd() .
+ $this->parent->getFieldsetEnd()
+ );
+ $caches = array( 'none', 'anything', 'db' );
+ if( count( $this->getVar( '_Caches' ) ) ) {
+ $caches[] = 'accel';
+ }
+ $caches[] = 'memcached';
+
+ $this->parent->output->addHTML(
# Advanced settings
$this->parent->getFieldsetStart( 'config-advanced-settings' ) .
+ # Object cache settings
+ $this->parent->getRadioSet( array(
+ 'var' => 'wgMainCacheType',
+ 'label' => 'config-cache-options',
+ 'itemLabelPrefix' => 'config-cache-',
+ 'values' => $caches,
+ ) ) .
+ $this->parent->getHelpBox( 'config-cache-help' ) .
$this->parent->getFieldsetEnd() .
"<script type=\"text/javascript\">$licenseJs $emailJs $uploadJs</script>\n"
@@ -1397,7 +1413,7 @@
$this->parent->setVarsFromRequest( array( '_RightsProfile', '_LicenseCode',
'wgEnableEmail', 'wgPasswordSender', 'wgEnableUpload', 'wgLogo',
'wgEnableUserEmail', 'wgEnotifUserTalk', 'wgEnotifWatchlist',
- 'wgEmailAuthentication') );
+ 'wgEmailAuthentication', 'wgMainCacheType' ) );
if ( !in_array( $this->getVar( '_RightsProfile' ),
array_keys( $this->parent->rightsProfiles ) ) )
Index: branches/new-installer/phase3/languages/messages/MessagesEn.php
===================================================================
--- branches/new-installer/phase3/languages/messages/MessagesEn.php (revision 63388)
+++ branches/new-installer/phase3/languages/messages/MessagesEn.php (revision 63389)
@@ -4423,6 +4423,14 @@
'config-cc-again' => 'Pick again...',
'config-cc-not-chosen' => 'Please choose which Creative Commons license you want and click "proceed".',
'config-advanced-settings' => 'Advanced configuration',
+'config-cache-options' => 'Object cache settings',
+'config-cache-help' => 'Object caching is used to improve the speed of MediaWiki. Medium to large sites
+are highly encouraged to enable this, and small sites will see benefits as well.',
+'config-cache-anything' => 'MediaWiki will attempt to cache anywhere possible, except Memcached',
+'config-cache-db' => 'Cache data in the database',
+'config-cache-accel' => 'PHP object caching (APC, eAccelerator or XCache)',
+'config-cache-memcached' => 'Use Memcached (requires additional setup, and server IP addresses below)',
+'config-cache-none' => 'Use no caching. No functionality is removed, but speed may be impacted',
'config-extensions' => 'Extensions',
'config-extensions-help' => "The following extensions were automatically detected in your extensions directory.\n
