diff options
author | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-04 13:37:42 -0500 |
---|---|---|
committer | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-04 13:37:42 -0500 |
commit | 89315722a11ac04da5a50333a29d4d8ac2376b98 (patch) | |
tree | 3070cf35d586be2b5f60f4538741e381f169df91 | |
parent | 947720b8007623bc1e68f7f41c251cdbeb791830 (diff) | |
parent | 45f49a090aea50b29a9162717ce38799cd0c7111 (diff) | |
download | nextcloud-server-89315722a11ac04da5a50333a29d4d8ac2376b98.tar.gz nextcloud-server-89315722a11ac04da5a50333a29d4d8ac2376b98.zip |
Merge branch 'master' into autoenable-federation-app
-rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 2 |
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; } |