Skip to content

Commit 84c2dfd

Browse files
authored
Merge pull request #14415 from nextcloud/backport/13844/stable14
[stable14] Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
2 parents 1d33283 + 39cbc6e commit 84c2dfd

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

apps/files_trashbin/lib/Trashbin.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -680,11 +680,10 @@ private static function calculateFreeSpace($trashbinSize, $user) {
680680
// calculate available space for trash bin
681681
// subtract size of files and current trash bin size from quota
682682
if ($softQuota) {
683-
$userFolder = \OC::$server->getUserFolder($user);
684-
if(is_null($userFolder)) {
685-
return 0;
686-
}
687-
$free = $quota - $userFolder->getSize(); // remaining free space for user
683+
$files_view = new View('/' . $user . '/files');
684+
$rootInfo = $files_view->getFileInfo('/', false);
685+
$free = $quota - $rootInfo['size']; // remaining free space for user
686+
688687
if ($free > 0) {
689688
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
690689
} else {

0 commit comments

Comments
 (0)