Merge branch 'sharing'

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 911a85e4a33..76032fae204 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -175,7 +175,7 @@ class OC_Filesystem{
 	* @param string path
 	* @return OC_Filestorage
 	*/
-	static private function getStorage($path){
+	static public function getStorage($path){
 		$mountpoint=self::getMountPoint($path);
 		if($mountpoint){
 			return self::$storages[$mountpoint];
@@ -189,7 +189,7 @@ class OC_Filesystem{
 	* @param string path
 	* @return string
 	*/
-	static private function getMountPoint($path){
+	static public function getMountPoint($path){
 		if(!$path){
 			$path='/';
 		}
@@ -214,6 +214,7 @@ class OC_Filesystem{
 		}
 		return $foundMountPoint;
 	}
+	
 	/**
 	* return the path to a local version of the file
 	* we need this because we can't know if a file is stored local or not from outside the filestorage and for some purposes a local file is needed
diff --git a/lib/util.php b/lib/util.php
index 0fdfa012305..f4ca879a9bc 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -53,6 +53,10 @@ class OC_Util {
 // 			}
 			OC_Filesystem::mount($rootStorage,'/');
 
+			// TODO add this storage provider in a proper way
+			$sharedStorage = OC_Filesystem::createStorage('shared',array('datadir'=>'/'.OC_User::getUser().'/files/Shared'));
+			OC_Filesystem::mount($sharedStorage,'/'.OC_User::getUser().'/files/Shared/');
+
 			$CONFIG_DATADIRECTORY = "$CONFIG_DATADIRECTORY_ROOT/$user/$root";
 			if( !is_dir( $CONFIG_DATADIRECTORY )){
 				mkdir( $CONFIG_DATADIRECTORY, 0755, true );