From: skodak <skodak>
Date: Sat, 7 Feb 2009 15:23:30 +0000 (+0000)
Subject: MDL-18167 let distros set default dataroot
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4f9dba35a3afdd4e45cf4c372598fa2ce3b626d5;p=moodle.git

MDL-18167 let distros set default dataroot
---

diff --git a/install.php b/install.php
index 2e1b7d832b..a3a36bd883 100644
--- a/install.php
+++ b/install.php
@@ -92,7 +92,7 @@ if (!empty($_POST)) {
 } else {
     $config->stage    = INSTALL_WELCOME;
 
-    $config->dbtype   = empty($distro->dbtype) ? '' : $distro->dbtype; // let distro packagings skip dbtype selection
+    $config->dbtype   = empty($distro->dbtype) ? '' : $distro->dbtype; // let distro skip dbtype selection
     $config->dbhost   = 'localhost';
     $config->dbuser   = '';
     $config->dbpass   = '';
@@ -103,7 +103,7 @@ if (!empty($_POST)) {
     $config->dirroot  = dirname(__FILE__);
     $config->admin    = 'admin';
 
-    $config->dataroot = null; // initialised later after including libs
+    $config->dataroot = empty($distro->dataroot) ? null  : $distro->dataroot; // initialised later after including libs or by distro
 }
 
 /// Fake some settings so that we can use selected functions from moodlelib.php and weblib.php