sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix error in recursive search

remotes/origin/stable5
Thomas Mueller 2013-02-15 17:41:22 +07:00
parent 191da024fa
commit b488800bd5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/files/storage/mappedlocal.php
Unescape Escape View File

@ -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;