summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-02-25 16:49:11 +0100
committerVincent Petry <pvince81@owncloud.com>2016-02-25 16:49:11 +0100
commit4c3f9bd489b3788338e8acd163bebd5804bb13fa (patch)
tree01dabcb7f0b4c058d4faefe1cd45bb6b0a965e8f /lib
parent75f95879152c4772d7ebabdbdc7620412dd82503 (diff)
parent60ff1de286aa4a16186c8d64f506628c1b442b02 (diff)
downloadnextcloud-server-4c3f9bd489b3788338e8acd163bebd5804bb13fa.tar.gz
nextcloud-server-4c3f9bd489b3788338e8acd163bebd5804bb13fa.zip
Merge pull request #22633 from owncloud/stable8.2-backport-22565
[stable8.2] Avoids scanning the root storage
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/utils/scanner.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index 85ca734c146..3756a32e3b4 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -135,6 +135,10 @@ class Scanner extends PublicEmitter {
if (is_null($mount->getStorage())) {
continue;
}
+ // don't scan the root storage
+ if ($mount->getStorage()->instanceOfStorage('\OC\Files\Storage\Local') && $mount->getMountPoint() === '/') {
+ continue;
+ }
$scanner = $mount->getStorage()->getScanner();
$this->attachListener($mount);
$scanner->backgroundScan();