Merge branch 'stable9' into enable-federation-app-stable9

This commit is contained in:
C. Montero Luque 2016-03-04 13:38:02 -05:00
commit 121ff350d4
1 changed files with 1 additions and 1 deletions

View File

@ -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;
}