X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Finstaller%2FLocalSettingsGenerator.php;h=a9710eb9f626ba3359ea188142b79e9bf2dcc69e;hb=cc0d030a96f9635a7da24cd3e6c42177a3bd100d;hp=dde4daa305c6bcad92fa069e066310f7c9c93af2;hpb=b47a3006ab6b6e626e7f7116cd3ccaa54ffff498;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index dde4daa305..a9710eb9f6 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -65,12 +65,11 @@ class LocalSettingsGenerator {
 				'_MemCachedServers', 'wgDBserver', 'wgDBuser',
 				'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin',
 				'wgMetaNamespace', 'wgLogo', 'wgAuthenticationTokenVersion', 'wgPingback',
-				'_Caches',
 			],
 			$db->getGlobalNames()
 		);
 
-		$unescaped = [ 'wgRightsIcon', 'wgLogo' ];
+		$unescaped = [ 'wgRightsIcon', 'wgLogo', '_Caches' ];
 		$boolItems = [
 			'wgEnableEmail', 'wgEnableUserEmail', 'wgEnotifUserTalk',
 			'wgEnotifWatchlist', 'wgEmailAuthentication', 'wgEnableUploads', 'wgUseInstantCommons',
@@ -242,7 +241,7 @@ class LocalSettingsGenerator {
 		}
 
 		if ( !$this->values['wgShellLocale'] ) {
-			$this->values['wgShellLocale'] = 'en_US.UTF-8';
+			$this->values['wgShellLocale'] = 'C.UTF-8';
 			$locale = '#';
 		} else {
 			$locale = '';
@@ -294,17 +293,11 @@ class LocalSettingsGenerator {
 			case 'db':
 			case 'memcached':
 			case 'accel':
-			case 'none':
 				$cacheType = 'CACHE_' . strtoupper( $this->values['_MainCacheType'] );
 				break;
+			case 'none':
 			default:
-				// If the user skipped the options page,
-				// default to CACHE_ACCEL if available
-				if ( count( $this->values['_Caches'] ) ) {
-					$cacheType = 'CACHE_ACCEL';
-				} else {
-					$cacheType = 'CACHE_NONE';
-				}
+				$cacheType = 'CACHE_NONE';
 		}
 
 		$mcservers = $this->buildMemcachedServerList();