MDL-18167 let distros set default dataroot

saifulomar · Feb 7, 2009 · 4f9dba3 · 4f9dba3
1 parent 5167827
commit 4f9dba3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/install.php b/install.php
@@ -92,7 +92,7 @@
 } 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 @@
     $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