2 files changed, 7 insertions, 2 deletions
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 221345332b0..6cba6b1b547 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -503,7 +503,7 @@ class OC_Filesystem{
 			$path='/'.$path;
 		}
 		//remove trainling slash
-		if(substr($path,-1,1)==='/'){
+		if(strlen($path)>1 and substr($path,-1,1)==='/'){
 			$path=substr($path,0,-1);
 		}
 		//remove duplicate slashes
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 17d09a07001..9d85befdc8c 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -103,7 +103,12 @@ class OC_FilesystemView {
 		if(strpos($path, $this->fakeRoot)!==0) {
 			return null;
 		}else{
-			return substr($path, strlen($this->fakeRoot));
+			$path=substr($path, strlen($this->fakeRoot));
+			if(strlen($path)===0){
+				return '/';
+			}else{
+				return $path;
+			}
 		}
 	}