Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoracsfer <carlos@reendex.com>2021-12-10 17:12:18 +0300
committerGitHub <noreply@github.com>2021-12-10 17:12:18 +0300
commit94d3d0b840301e412873949aad916033b29f0c2e (patch)
treeadb7e55ce7f9a55ee9a971e3b9c6457966f040ad
parentfd75f381f46707be724099053e265ac8cc944e38 (diff)
Update Scanner.phplogical-ops
-rw-r--r--lib/private/Files/Utils/Scanner.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php
index 2e5a25a355b..4187a065e9e 100644
--- a/lib/private/Files/Utils/Scanner.php
+++ b/lib/private/Files/Utils/Scanner.php
@@ -213,10 +213,10 @@ class Scanner extends PublicEmitter {
}
// if the home storage isn't writable then the scanner is run as the wrong user
- if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
- (!$storage->isCreatable('') or !$storage->isCreatable('files'))
+ if ($storage->instanceOfStorage('\OC\Files\Storage\Home') &&
+ (!$storage->isCreatable('') || !$storage->isCreatable('files'))
) {
- if ($storage->file_exists('') or $storage->getCache()->inCache('')) {
+ if ($storage->file_exists('') || $storage->getCache()->inCache('')) {
throw new ForbiddenException();
} else {// if the root exists in neither the cache nor the storage the user isn't setup yet
break;