aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-10-21 21:03:37 -0400
committerCash Costello <cash.costello@gmail.com>2011-10-21 21:03:37 -0400
commit7ef727bfa242015d3ca7ab22671ec020006f0b4e (patch)
treea892bded76e7f6d5242f581d6dc588c3b6cdd286 /engine
parent6628e7db7895855784e43fce74c7dec41f01c2dc (diff)
downloadelgg-7ef727bfa242015d3ca7ab22671ec020006f0b4e.tar.gz
elgg-7ef727bfa242015d3ca7ab22671ec020006f0b4e.tar.bz2
don't set default filestore if we don't have a dataroot
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/filestore.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index a7aa1ff8c..a13d8aa27 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -483,8 +483,10 @@ function filestore_init() {
global $CONFIG;
// Now register a default filestore
- set_default_filestore(new ElggDiskFilestore($CONFIG->dataroot));
-
+ if (isset($CONFIG->dataroot)) {
+ set_default_filestore(new ElggDiskFilestore($CONFIG->dataroot));
+ }
+
// Now run this stuff, but only once
run_function_once("filestore_run_once");
}