diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-01-31 12:44:01 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-01-31 12:44:01 +0100 |
| commit | 803f86e0fcd77e3888daa387142fd197083d5fd3 (patch) | |
| tree | 8ea11a5473db7b03359d62ece0a51887cd8cbe74 | |
| parent | ffecc3e4341102714a89ab6b5643c666c1feb0ee (diff) | |
| download | nextcloud-server-803f86e0fcd77e3888daa387142fd197083d5fd3.tar.gz nextcloud-server-803f86e0fcd77e3888daa387142fd197083d5fd3.zip | |
dont try to use the filesystem when it isnt setup yet
| -rw-r--r-- | apps/files_sharing/sharedstorage.php | 2 | ||||
| -rw-r--r-- | lib/filesystem.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php index 529a82b830a..fa6fe7913f2 100644 --- a/apps/files_sharing/sharedstorage.php +++ b/apps/files_sharing/sharedstorage.php @@ -22,7 +22,7 @@ require_once( 'lib_share.php' ); -if (!OC_Filesystem::is_dir('/Shared')) { +if (OC_Filesystem::$loaded and !OC_Filesystem::is_dir('/Shared')) { OC_Filesystem::mkdir('/Shared'); } OC_Filesystem::mount('OC_Filestorage_Shared',array('datadir'=>'/'.OC_User::getUser().'/files/Shared'),'/'.OC_User::getUser().'/files/Shared/'); diff --git a/lib/filesystem.php b/lib/filesystem.php index 60d3f56a24c..8502cfc08bb 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -47,6 +47,7 @@ class OC_Filesystem{ static private $storages=array(); static private $mounts=array(); static private $storageTypes=array(); + public static $loaded=false; private $fakeRoot=''; static private $defaultInstance; @@ -200,6 +201,7 @@ class OC_Filesystem{ return false; } self::$defaultInstance=new OC_FilesystemView($root); + self::$loaded=true; } /** |