http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55150
Revision: 55150
Author: demon
Date: 2009-08-16 18:36:46 +0000 (Sun, 16 Aug 2009)
Log Message:
-----------
Partial revert of r55147, don't need to display PHP cache choices to user
Modified Paths:
--------------
branches/new-installer/phase3/includes/installer/Installer.php
branches/new-installer/phase3/includes/installer/WebInstaller.php
branches/new-installer/phase3/languages/messages/MessagesEn.php
branches/new-installer/phase3/maintenance/language/messages.inc
Modified: branches/new-installer/phase3/includes/installer/Installer.php
===================================================================
--- branches/new-installer/phase3/includes/installer/Installer.php
2009-08-16 18:04:03 UTC (rev 55149)
+++ branches/new-installer/phase3/includes/installer/Installer.php
2009-08-16 18:36:46 UTC (rev 55150)
@@ -46,8 +46,7 @@
'_SafeMode' => false,
'_RaiseMemory' => false,
'_UpgradeDone' => false,
- '_AvailableCaches' => array(),
- '_Cache' => false,
+ '_Caches' => array(),
'_InstallUser' => 'root',
'_InstallPassword' => '',
'_SameAccount' => true,
@@ -439,7 +438,7 @@
if ( !$caches ) {
$this->showMessage( 'config-no-cache' );
}
- $this->setVar( '_AvailableCaches', $caches );
+ $this->setVar( '_Caches', $caches );
}
/** Search for GNU diff3 */
Modified: branches/new-installer/phase3/includes/installer/WebInstaller.php
===================================================================
--- branches/new-installer/phase3/includes/installer/WebInstaller.php
2009-08-16 18:04:03 UTC (rev 55149)
+++ branches/new-installer/phase3/includes/installer/WebInstaller.php
2009-08-16 18:36:46 UTC (rev 55150)
@@ -1200,7 +1200,6 @@
$licenseJs = 'showControlArray("config__LicenseCode_cc-choose",
["config-cc-wrapper"]);';
$emailJs = 'enableControlArray("config_wgEnableEmail",
["config_wgPasswordSender"]);';
$uploadJs = 'enableControlArray("config_wgEnableUploads",
["config_wgDeletedDirectory"]);';
- $caches = $this->getVar( '_AvailableCaches' );
$this->startForm();
$this->parent->output->addHTML(
@@ -1261,13 +1260,6 @@
# Advanced settings
$this->parent->getFieldsetStart(
'config-advanced-settings' ) .
- ( $caches ? $this->parent->getRadioSet( array(
- 'var' => '_Cache',
- 'label' => 'config-caching',
- 'itemLabelPrefix' => 'config-caching-',
- 'values' => array_keys( $caches ),
- ) ) .
- $this->parent->getHelpBox( 'config-caching-help' ) : ''
) .
$this->parent->getFieldsetEnd() .
"<script type=\"text/javascript\">$licenseJs $emailJs
$uploadJs</script>\n"
Modified: branches/new-installer/phase3/languages/messages/MessagesEn.php
===================================================================
--- branches/new-installer/phase3/languages/messages/MessagesEn.php
2009-08-16 18:04:03 UTC (rev 55149)
+++ branches/new-installer/phase3/languages/messages/MessagesEn.php
2009-08-16 18:36:46 UTC (rev 55150)
@@ -4311,11 +4311,6 @@
'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-caching' => 'Object caching',
-'config-caching-help' => 'Object caching is generally recommended for most
medium and large sites',
-'config-caching-xcache' => 'XCache',
-'config-caching-apc' => 'APC',
-'config-caching-eaccel' => 'eAccelerator',
# Special:Version
'version' => 'Version',
Modified: branches/new-installer/phase3/maintenance/language/messages.inc
===================================================================
--- branches/new-installer/phase3/maintenance/language/messages.inc
2009-08-16 18:04:03 UTC (rev 55149)
+++ branches/new-installer/phase3/maintenance/language/messages.inc
2009-08-16 18:36:46 UTC (rev 55150)
@@ -3254,11 +3254,6 @@
'config-cc-again',
'config-cc-not-chosen',
'config-advanced-settings',
- 'config-caching',
- 'config-caching-help',
- 'config-caching-xcache',
- 'config-caching-apc',
- 'config-caching-eaccel',
),
);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
