aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-19 10:55:05 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-19 10:55:05 +0000
commit68d0553cc7bee69a859e5be2fad99362d5b8b917 (patch)
tree94581b3521b9b2ad69186b5d255d3b45e325e23a /engine/lib
parenta8d2e7926b2ce118cbe8d789ffb2e699c28d2df9 (diff)
downloadelgg-68d0553cc7bee69a859e5be2fad99362d5b8b917.tar.gz
elgg-68d0553cc7bee69a859e5be2fad99362d5b8b917.tar.bz2
Fixing the install process, step 1.
git-svn-id: https://code.elgg.org/elgg/trunk@653 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/configuration.php10
1 files changed, 7 insertions, 3 deletions
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;
}