Merge branch 'master' into autoenable-federation-app

2016-03-04 13:37:42 -05:00 · 2016-03-04 13:37:42 -05:00 · 89315722a1
parent 947720b800 45f49a090a
commit 89315722a1
1 changed files with 1 additions and 1 deletions
--- 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;
 		}