diff options
| author | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-04 21:36:07 +0300 |
|---|---|---|
| committer | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-04 21:36:07 +0300 |
| commit | 384af4731cd80060d5bb3db6154b820024e724a4 (patch) | |
| tree | a68e36efc358cf4a20be07cdf6384c67eb6bbd98 | |
| parent | 279f1d00104d2c174deb158027fd17088b1208b3 (diff) | |
| parent | 833729808cefe1e1590ce1611193f92754b9a3ec (diff) | |
Merge pull request #22863 from owncloud/stable8.1-trashbin-checkpath
[stable8.1] Properly check path validity before deleting to trash
| -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 0f556a0aaf7..215cdd7891a 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -179,7 +179,7 @@ class Trashbin { $view = new \OC\Files\View('/' . $user); // file has been deleted in between - if (!$view->file_exists('/files/' . $file_path)) { + if (is_null($ownerPath) || $ownerPath === '' || !$view->file_exists('/files/' . $file_path)) { return true; } |