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:
authorC. Montero Luque <cmonteroluque@users.noreply.github.com>2016-03-04 21:36:25 +0300
committerC. Montero Luque <cmonteroluque@users.noreply.github.com>2016-03-04 21:36:25 +0300
commit7dd55731d204638fcbf80b7db8d0a4ffd3c47db6 (patch)
tree02a58291636527391c207d34a94cac3c29a5e025
parent519191bb052165880c92f74347bd0a950a45fa71 (diff)
parentda242962c3935573a1a04a5e523bf673f7da089d (diff)
Merge pull request #22864 from owncloud/stable8-trashbin-checkpath
[stable8] Properly check path validity before deleting to trash
-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 2898f849da4..25b0e43041a 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -153,7 +153,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;
}