| Index: branches/new-installer/phase3/maintenance/language/messages.inc |
| — | — | @@ -3332,6 +3332,13 @@ |
| 3333 | 3333 | 'config-cc-again', |
| 3334 | 3334 | 'config-cc-not-chosen', |
| 3335 | 3335 | 'config-advanced-settings', |
| | 3336 | + 'config-cache-settings', |
| | 3337 | + 'config-cache-help', |
| | 3338 | + 'config-cache-none', |
| | 3339 | + 'config-cache-accel', |
| | 3340 | + 'config-cache-memcached', |
| | 3341 | + 'config-cache-db', |
| | 3342 | + 'config-cache-anything', |
| 3336 | 3343 | 'config-extensions', |
| 3337 | 3344 | 'config-extensions-help', |
| 3338 | 3345 | 'config-stage-done', |
| Index: branches/new-installer/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -1299,10 +1299,26 @@ |
| 1300 | 1300 | 'label' => 'config-logo' |
| 1301 | 1301 | ) ) . |
| 1302 | 1302 | $this->parent->getHelpBox( 'config-logo-help' ) . |
| 1303 | | - $this->parent->getFieldsetEnd() . |
| | 1303 | + $this->parent->getFieldsetEnd() |
| | 1304 | + ); |
| 1304 | 1305 | |
| | 1306 | + $caches = array( 'none', 'anything', 'db' ); |
| | 1307 | + if( count( $this->getVar( '_Caches' ) ) ) { |
| | 1308 | + $caches[] = 'accel'; |
| | 1309 | + } |
| | 1310 | + $caches[] = 'memcached'; |
| | 1311 | + |
| | 1312 | + $this->parent->output->addHTML( |
| 1305 | 1313 | # Advanced settings |
| 1306 | 1314 | $this->parent->getFieldsetStart( 'config-advanced-settings' ) . |
| | 1315 | + # Object cache settings |
| | 1316 | + $this->parent->getRadioSet( array( |
| | 1317 | + 'var' => 'wgMainCacheType', |
| | 1318 | + 'label' => 'config-cache-options', |
| | 1319 | + 'itemLabelPrefix' => 'config-cache-', |
| | 1320 | + 'values' => $caches, |
| | 1321 | + ) ) . |
| | 1322 | + $this->parent->getHelpBox( 'config-cache-help' ) . |
| 1307 | 1323 | $this->parent->getFieldsetEnd() . |
| 1308 | 1324 | |
| 1309 | 1325 | "<script type=\"text/javascript\">$licenseJs $emailJs $uploadJs</script>\n" |
| — | — | @@ -1397,7 +1413,7 @@ |
| 1398 | 1414 | $this->parent->setVarsFromRequest( array( '_RightsProfile', '_LicenseCode', |
| 1399 | 1415 | 'wgEnableEmail', 'wgPasswordSender', 'wgEnableUpload', 'wgLogo', |
| 1400 | 1416 | 'wgEnableUserEmail', 'wgEnotifUserTalk', 'wgEnotifWatchlist', |
| 1401 | | - 'wgEmailAuthentication') ); |
| | 1417 | + 'wgEmailAuthentication', 'wgMainCacheType' ) ); |
| 1402 | 1418 | |
| 1403 | 1419 | if ( !in_array( $this->getVar( '_RightsProfile' ), |
| 1404 | 1420 | array_keys( $this->parent->rightsProfiles ) ) ) |
| Index: branches/new-installer/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4423,6 +4423,14 @@ |
| 4424 | 4424 | 'config-cc-again' => 'Pick again...', |
| 4425 | 4425 | 'config-cc-not-chosen' => 'Please choose which Creative Commons license you want and click "proceed".', |
| 4426 | 4426 | 'config-advanced-settings' => 'Advanced configuration', |
| | 4427 | +'config-cache-options' => 'Object cache settings', |
| | 4428 | +'config-cache-help' => 'Object caching is used to improve the speed of MediaWiki. Medium to large sites |
| | 4429 | +are highly encouraged to enable this, and small sites will see benefits as well.', |
| | 4430 | +'config-cache-anything' => 'MediaWiki will attempt to cache anywhere possible, except Memcached', |
| | 4431 | +'config-cache-db' => 'Cache data in the database', |
| | 4432 | +'config-cache-accel' => 'PHP object caching (APC, eAccelerator or XCache)', |
| | 4433 | +'config-cache-memcached' => 'Use Memcached (requires additional setup, and server IP addresses below)', |
| | 4434 | +'config-cache-none' => 'Use no caching. No functionality is removed, but speed may be impacted', |
| 4427 | 4435 | |
| 4428 | 4436 | 'config-extensions' => 'Extensions', |
| 4429 | 4437 | 'config-extensions-help' => "The following extensions were automatically detected in your extensions directory.\n |