From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 26 Oct 2015 17:32:52 +0000 (+0000)
Subject: Merge "Installer: use _MainCacheType form variable"
X-Git-Tag: 1.31.0-rc.0~9241
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=f4a5507a966861a56e072dd7434fce9d933b3eaf;p=lhc%2Fweb%2Fwiklou.git

Merge "Installer: use _MainCacheType form variable"
---

f4a5507a966861a56e072dd7434fce9d933b3eaf
diff --cc includes/installer/LocalSettingsGenerator.php
index 526d9b52a9,8953bd106f..b74207431a
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@@ -287,10 -287,10 +287,10 @@@ class LocalSettingsGenerator 
  		$serverSetting = "";
  		if ( array_key_exists( 'wgServer', $this->values ) && $this->values['wgServer'] !== null ) {
  			$serverSetting = "\n## The protocol and server name to use in fully-qualified URLs\n";
 -			$serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";\n";
 +			$serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";";
  		}
  
- 		switch ( $this->values['wgMainCacheType'] ) {
+ 		switch ( $this->values['_MainCacheType'] ) {
  			case 'anything':
  			case 'db':
  			case 'memcached':