diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-23 10:53:26 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-23 10:53:26 -0700 |
| commit | 5d38476faf775ce6c639d20bc685a7117d29b8f5 (patch) | |
| tree | 80d28d69e5a066ba5f2e10d108175813d9432c0f /engine/lib/filestore.php | |
| parent | f1be73852439f5eb7a9f6fdf1e9587f7b2346f69 (diff) | |
| parent | a18ba9dad699ca785e4d8fc37a5fe95a060584e0 (diff) | |
| download | elgg-5d38476faf775ce6c639d20bc685a7117d29b8f5.tar.gz elgg-5d38476faf775ce6c639d20bc685a7117d29b8f5.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine/lib/filestore.php')
| -rw-r--r-- | engine/lib/filestore.php | 6 |
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"); } |