From b488800bd5665eaa11b54002509e9e8b85c0780e Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 15 Feb 2013 17:41:22 +0100
Subject: [PATCH] fix error in recursive search
---
lib/files/storage/mappedlocal.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index e707f71d71..434c10bcbf 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -20,7 +20,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
$this->datadir.='/';
}
- $this->mapper= new \OC\Files\Mapper();
+ $this->mapper= new \OC\Files\Mapper($this->datadir);
}
public function __destruct() {
if (defined('PHPUNIT_RUN')) {
@@ -274,7 +274,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
return $this->buildPath($path);
}
- protected function searchInDir($query, $dir='', $isLogicPath=true) {
+ protected function searchInDir($query, $dir='') {
$files=array();
$physicalDir = $this->buildPath($dir);
foreach (scandir($physicalDir) as $item) {
@@ -287,7 +287,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
$files[]=$dir.'/'.$item;
}
if(is_dir($physicalItem)) {
- $files=array_merge($files, $this->searchInDir($query, $physicalItem, false));
+ $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
}
}
return $files;
--
GitLab