From: C. Scott Ananian <cscott@cscott.net>
Date: Wed, 28 Oct 2015 02:01:54 +0000 (-0400)
Subject: Fix CLI installer when --dbname is not specified on command line.
X-Git-Tag: 1.31.0-rc.0~8328^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=777c6dad44274b578d599818cedd2fba0b222e5d;p=lhc%2Fweb%2Fwiklou.git

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

When installing without an explicit `--dbname` argument on the command
line, the database is installed with the default value of $wgDBname
from DefaultSettings.php (which is `my_wiki`), but then the
LocalSettings.php file is written with the line:
    $wgDBname = "";
which overrides the default value and makes the wiki unable to
connect to the database created by the installer.

Adding `wgDBname` to the `$defaultVarNames` list fixes this problem.

Change-Id: I3792be9675aabe00b5497ed4203b12b89da8dc3a
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index ba0e38ffbc..dd12cea6f9 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -169,6 +169,7 @@ abstract class Installer {
 		'wgEnotifUserTalk',
 		'wgEnotifWatchlist',
 		'wgEmailAuthentication',
+		'wgDBname',
 		'wgDBtype',
 		'wgDiff3',
 		'wgImageMagickConvertCommand',