From: Brion Vibber
Date: Thu, 8 May 2008 20:04:45 +0000 (+0000)
Subject: * (bug 14047) Fix regression in installer which hid DB-specific options.
X-Git-Tag: 1.31.0-rc.0~47807
X-Git-Url: https://git.cyclocoop.org/admin/%7B%7Blocalurl:Special:UserLogin%7D%7D?a=commitdiff_plain;h=1c5386916ef082bb88d40948df38c023f12f8a23;p=lhc%2Fweb%2Fwiklou.git
* (bug 14047) Fix regression in installer which hid DB-specific options.
Also makes SQLite path configurable in the installer.
$wgSQLiteDataDir wasn't being initialized in DefaultSettings.php, potentially open to register_globals attacks. Now initialized to '', which gets interpreted as default.
Now adding only the options for the relevant DB to the generated LocalSettings.php
---
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 88ef81e902..e4ae4c3324 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -262,6 +262,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
Note that case mappings will only be used if mbstring extension is not present.
* (bug 14044) Don't increment page view counters on views from bot users
* (bug 14042) Calling Database::limitResult() misplaced the comment in the log file
+* (bug 14047) Fix regression in installer which hid DB-specific options.
+ Also makes SQLite path configurable in the installer.
+
=== API changes in 1.13 ===
diff --git a/config/index.php b/config/index.php
index 3bf95c11d5..f67b739795 100644
--- a/config/index.php
+++ b/config/index.php
@@ -603,6 +603,9 @@ print "Environment check
$conf->DBport = importPost( "DBport", "5432" );
$conf->DBmwschema = importPost( "DBmwschema", "mediawiki" );
$conf->DBts2schema = importPost( "DBts2schema", "public" );
+
+ ## SQLite specific
+ $conf->SQLiteDataDir = importPost( "SQLiteDataDir", "" );
/* Check for validity */
$errs = array();
@@ -1413,7 +1416,7 @@ if( count( $errs ) ) {
cause things to break. If upgrading an older installation, leave
in backwards-compatible mode.
-
+