summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-01 11:32:12 +0200
committerVincent Petry <pvince81@owncloud.com>2016-06-01 11:32:12 +0200
commita420749255a934561e3bece962b4f1645171493f (patch)
tree0cbf0734ebffe3db89fd99e1782a3a60499dc5d7
parent420dab76385cddabb6182bf05f6568b8aa660a9e (diff)
parentc131ced0a83ec15ecdce81c5a9bcf5ca3dfd65d9 (diff)
downloadnextcloud-server-a420749255a934561e3bece962b4f1645171493f.tar.gz
nextcloud-server-a420749255a934561e3bece962b4f1645171493f.zip
Merge pull request #24901 from owncloud/stable8-backport-scan-fix
[stable8] fix getting mount points when passing a path to the files:scan command
-rw-r--r--lib/private/files/utils/scanner.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index d04dbd2bd72..5f35cd0c192 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -59,11 +59,10 @@ class Scanner extends PublicEmitter {
//TODO: move to the node based fileapi once that's done
\OC_Util::tearDownFS();
\OC_Util::setupFS($this->user);
- $absolutePath = Filesystem::getView()->getAbsolutePath($dir);
$mountManager = Filesystem::getMountManager();
- $mounts = $mountManager->findIn($absolutePath);
- $mounts[] = $mountManager->find($absolutePath);
+ $mounts = $mountManager->findIn($dir);
+ $mounts[] = $mountManager->find($dir);
$mounts = array_reverse($mounts); //start with the mount of $dir
return $mounts;