summaryrefslogtreecommitdiffstats
path: root/lib/private/files
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-02-25 16:49:23 +0100
committerVincent Petry <pvince81@owncloud.com>2016-02-25 16:49:23 +0100
commit0df34d96e0d106b9dbf07b1c3702563978cc4259 (patch)
tree1ce7db205b4af1280ef1fdb04b5af78c07cf865b /lib/private/files
parentaebafadd99dc8d186139bcac7626b8c252b5fe30 (diff)
parent963c3aa93e6e599765fa72138ac4a7272a1b3fa8 (diff)
downloadnextcloud-server-0df34d96e0d106b9dbf07b1c3702563978cc4259.tar.gz
nextcloud-server-0df34d96e0d106b9dbf07b1c3702563978cc4259.zip
Merge pull request #22634 from owncloud/stable8.1-backport-22565
[stable8.1] Avoids scanning the root storage
Diffstat (limited to 'lib/private/files')
-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 d431df0cd12..53895eef645 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -133,6 +133,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();