Merge "Installer: use _MainCacheType form variable"

diff --cc includes/installer/Installer.php
Simple merge

diff --cc includes/installer/LocalSettingsGenerator.php
index 526d9b5,8953bd1..b742074
--- 1/includes/installer/LocalSettingsGenerator.php
--- 2/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':