Merge branch 'master' into sharing

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/filesystem.php b/lib/filesystem.php
index c2153520650..829482c7fa5 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -574,14 +574,17 @@ class OC_Filesystem{
 	
 	static public function search($query){
 		$files=array();
-		$fakeRootLength=strlen(self::$fakeRoot);
+		$fakeRoot=self::$fakeRoot;
+		$fakeRootLength=strlen($fakeRoot);
 		foreach(self::$storages as $mountpoint=>$storage){
 			$results=$storage->search($query);
 			if(is_array($results)){
 				foreach($results as $result){
 					$file=str_replace('//','/',$mountpoint.$result);
-					$file=substr($file,$fakeRootLength);
-					$files[]=$file;
+					if(substr($file,0,$fakeRootLength)==$fakeRoot){
+						$file=substr($file,$fakeRootLength);
+						$files[]=$file;
+					}
 				}
 			}
 		}