From 803f86e0fcd77e3888daa387142fd197083d5fd3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 31 Jan 2012 12:44:01 +0100
Subject: [PATCH] dont try to use the filesystem when it isnt setup yet
---
apps/files_sharing/sharedstorage.php | 2 +-
lib/filesystem.php | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 529a82b830..fa6fe7913f 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 60d3f56a24..8502cfc08b 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;
}
/**
--
GitLab