summaryrefslogtreecommitdiffstats
path: root/lib/files/storage
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-15 17:41:22 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-15 17:41:22 +0100
commitb488800bd5665eaa11b54002509e9e8b85c0780e (patch)
tree0ae614da9f31a162bc32e9fe5d91cce8144c2a20 /lib/files/storage
parent191da024fa312c6322c00073c6cf48dc8e282ed0 (diff)
downloadnextcloud-server-b488800bd5665eaa11b54002509e9e8b85c0780e.tar.gz
nextcloud-server-b488800bd5665eaa11b54002509e9e8b85c0780e.zip
fix error in recursive search
Diffstat (limited to 'lib/files/storage')
-rw-r--r--lib/files/storage/mappedlocal.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index e707f71d71c..434c10bcbf7 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;