Merge "Fix CLI installer when --dbname is not specified on command line."

diff --combined includes/installer/Installer.php
index ea700c7,dd12cea..de84199
--- 1/includes/installer/Installer.php
--- 2/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@@ -169,6 -169,7 +169,7 @@@ abstract class Installer 
                'wgEnotifUserTalk',
                'wgEnotifWatchlist',
                'wgEmailAuthentication',
+               'wgDBname',
                'wgDBtype',
                'wgDiff3',
                'wgImageMagickConvertCommand',
@@@ -281,15 -282,15 +282,15 @@@
         */
        public $licenses = array(
                'cc-by' => array(
 -                      'url' => 'https://creativecommons.org/licenses/by/3.0/',
 +                      'url' => 'https://creativecommons.org/licenses/by/4.0/',
                        'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by.png',
                ),
                'cc-by-sa' => array(
 -                      'url' => 'https://creativecommons.org/licenses/by-sa/3.0/',
 +                      'url' => 'https://creativecommons.org/licenses/by-sa/4.0/',
                        'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-sa.png',
                ),
                'cc-by-nc-sa' => array(
 -                      'url' => 'https://creativecommons.org/licenses/by-nc-sa/3.0/',
 +                      'url' => 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
                        'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-nc-sa.png',
                ),
                'cc-0' => array(
@@@ -883,13 -884,7 +884,13 @@@
                }
  
                if ( !$caches ) {
 -                      $this->showMessage( 'config-no-cache' );
 +                      $key = 'config-no-cache';
 +                      // PHP >=5.5 is called APCu, earlier versions use APC (T61998).
 +                      if ( !wfIsHHVM() && version_compare( PHP_VERSION, '5.5', '>=' ) ) {
 +                              // config-no-cache-apcu
 +                              $key .= '-apcu';
 +                      }
 +                      $this->showMessage( $key );
                }
  
                $this->setVar( '_Caches', $caches );