diff options
Diffstat (limited to 'apps/files_trashbin/lib/trashbin.php')
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 5f1226d89d8..ca7e58d93bd 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -142,6 +142,12 @@ class Trashbin { $user = \OCP\User::getUser(); $size = 0; list($owner, $ownerPath) = self::getUidAndFilename($file_path); + + // file has been deleted in between + if (empty($ownerPath)) { + return false; + } + self::setUpTrash($user); $view = new \OC\Files\View('/' . $user); @@ -219,6 +225,10 @@ class Trashbin { $rootView = new \OC\Files\View('/'); list($owner, $ownerPath) = self::getUidAndFilename($file_path); + // file has been deleted in between + if (empty($ownerPath)) { + return 0; + } if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) { $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath)); @@ -262,6 +272,11 @@ class Trashbin { list($owner, $ownerPath) = self::getUidAndFilename($file_path); + // file has been deleted in between + if (empty($ownerPath)) { + return 0; + } + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user); // disable proxy to prevent recursive calls @@ -440,6 +455,12 @@ class Trashbin { list($owner, $ownerPath) = self::getUidAndFilename($target); + // file has been deleted in between + if (empty($ownerPath)) { + \OC_FileProxy::$enabled = $proxyStatus; + return false; + } + if ($timestamp) { $versionedFile = $filename; } else { @@ -484,6 +505,11 @@ class Trashbin { list($owner, $ownerPath) = self::getUidAndFilename($target); + // file has been deleted in between + if (empty($ownerPath)) { + return false; + } + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user); if ($util->isSystemWideMountPoint($ownerPath)) { |