summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorC. Montero Luque <cmonteroluque@users.noreply.github.com>2016-03-04 13:33:07 -0500
committerC. Montero Luque <cmonteroluque@users.noreply.github.com>2016-03-04 13:33:07 -0500
commit45f49a090aea50b29a9162717ce38799cd0c7111 (patch)
treed4738ac447b00d2eb6eb01cd6b6b1af0335e0519 /apps
parente2642129a18be54ce039ba96e89d160c45ff8b9f (diff)
parent0eb5292aaf0ea4c18a3811c561c28faa614b430d (diff)
downloadnextcloud-server-45f49a090aea50b29a9162717ce38799cd0c7111.tar.gz
nextcloud-server-45f49a090aea50b29a9162717ce38799cd0c7111.zip
Merge pull request #22860 from owncloud/trashbin-checkpath
Properly check path validity before deleting to trash
Diffstat (limited to 'apps')
-rw-r--r--apps/files_trashbin/lib/trashbin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index bcd73639d3c..46447908b90 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -204,7 +204,7 @@ class Trashbin {
$ownerView = new View('/' . $owner);
// file has been deleted in between
- if (!$ownerView->file_exists('/files/' . $ownerPath)) {
+ if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/' . $ownerPath)) {
return true;
}