From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Fri, 29 Jan 2010 08:13:23 +0000 (+0000)
Subject: follow up r61319
X-Git-Tag: 1.31.0-rc.0~38060
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=e88bf4e8b760b98f3cb3e92d9794019000c25bd2;p=lhc%2Fweb%2Fwiklou.git

follow up r61319
took out the ".." but otherwise left it the same.  On my system, this
installs an SQLite file in $IP/config/data by default using the web
installer.  Setting it to "$IP/../data" presents the user with the
/full/path/to/the/MW/../data which seemed more confusing to me.
---

diff --git a/config/Installer.php b/config/Installer.php
index 6ab7680130..dfcb794923 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -644,7 +644,7 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
 	$conf->DBpgschema  = importPost( "DBpgschema",  "mediawiki" );
 
 	## SQLite specific
-	$conf->SQLiteDataDir = importPost( "SQLiteDataDir", '../data' );
+	$conf->SQLiteDataDir = importPost( "SQLiteDataDir", "$IP/../data" );
 
 	## MSSQL specific
 	// We need a second field so it doesn't overwrite the MySQL one
@@ -1665,8 +1665,7 @@ if( count( $errs ) ) {
 	?></div>
 	<div class="config-desc">
 		<p>SQLite stores table data into files in the
-		filesystem.  By default the path is the "data"
-		directory in your document root.</p>
+		filesystem.</p>
 
 		<p>This directory must exist and be writable by the web server.</p>
 	</div>