allow tear down of filesystem.

also fix a bug when chrooting to '/'

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 2b5c3a56b6e..27a937f5e4c 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -68,6 +68,16 @@ class OC_FILESYSTEM{
 	}
 	
 	/**
+	 * tear down the filesystem, removing all storage providers
+	 */
+	static public function tearDown(){
+		foreach(self::$storages as $mountpoint=>$storage){
+			unset(self::$storages[$mountpoint]);
+		}
+		$fakeRoot='';
+	}
+	
+	/**
 	* create a new storage of a specific type
 	* @param  string  type
 	* @param  array  arguments
@@ -91,8 +101,10 @@ class OC_FILESYSTEM{
 	* @return bool
 	*/
 	static public function chroot($fakeRoot){
-		if($fakeRoot[0]!=='/'){
-			$fakeRoot='/'.$fakeRoot;
+		if(!$fakeRoot==''){
+			if($fakeRoot[0]!=='/'){
+				$fakeRoot='/'.$fakeRoot;
+			}
 		}
 		self::$fakeRoot=$fakeRoot;
 	}