From 68d0553cc7bee69a859e5be2fad99362d5b8b917 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 19 May 2008 10:55:05 +0000
Subject: Fixing the install process, step 1.

git-svn-id: https://code.elgg.org/elgg/trunk@653 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/configuration.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'engine/lib')

diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 94ef22a10..47a0d5428 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -116,9 +116,13 @@
 			
 			global $CONFIG;
 			
-			$CONFIG->path = datalist_get('path');
-			$CONFIG->dataroot = datalist_get('dataroot');
-			if (isset($CONFIG->site)) {
+			$path = datalist_get('path');
+			if (!empty($path))
+				$CONFIG->path = $path;
+			$dataroot = datalist_get('dataroot');
+			if (!empty($dataroot))
+				$CONFIG->dataroot = $dataroot;
+			if (isset($CONFIG->site) && (get_class($CONFIG->site) == "ElggSite")) {
 				$CONFIG->wwwroot = $CONFIG->site->url;
 				$CONFIG->sitename = $CONFIG->site->name;
 			}
-- 
cgit v1.2.3