summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-12-01 12:28:56 +0100
committerGitHub <noreply@github.com>2017-12-01 12:28:56 +0100
commitdc10a31a4a9c712f8c8ff0dd82565fd58a0a6d1f (patch)
treee948c7451f7e8f97cb2bd49e978c25f6cda2589e
parent007fba6fd9a084caf82dfe8d680a103ee755a5e1 (diff)
parent65d7468bf3c15c7983d9d8e4e73513ffa1d8b973 (diff)
downloadnextcloud-server-dc10a31a4a9c712f8c8ff0dd82565fd58a0a6d1f.tar.gz
nextcloud-server-dc10a31a4a9c712f8c8ff0dd82565fd58a0a6d1f.zip
Merge pull request #7361 from nextcloud/cheap-check-first
check userExists later, saves lookups for appData_INSTANCEID userids
-rw-r--r--apps/files_trashbin/lib/Storage.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/Storage.php b/apps/files_trashbin/lib/Storage.php
index 1193d6ec561..5eaf502f236 100644
--- a/apps/files_trashbin/lib/Storage.php
+++ b/apps/files_trashbin/lib/Storage.php
@@ -237,7 +237,7 @@ class Storage extends Wrapper {
return false;
}
- if ($this->userManager->userExists($parts[1]) && $parts[2] === 'files') {
+ if ($parts[2] === 'files' && $this->userManager->userExists($parts[1])) {
return true;
}