Merge pull request #14415 from nextcloud/backport/13844/stable14
[stable14] Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
This commit is contained in:
commit
84c2dfd442
|
@ -680,11 +680,10 @@ class Trashbin {
|
|||
// calculate available space for trash bin
|
||||
// subtract size of files and current trash bin size from quota
|
||||
if ($softQuota) {
|
||||
$userFolder = \OC::$server->getUserFolder($user);
|
||||
if(is_null($userFolder)) {
|
||||
return 0;
|
||||
}
|
||||
$free = $quota - $userFolder->getSize(); // remaining free space for user
|
||||
$files_view = new View('/' . $user . '/files');
|
||||
$rootInfo = $files_view->getFileInfo('/', false);
|
||||
$free = $quota - $rootInfo['size']; // remaining free space for user
|
||||
|
||||
if ($free > 0) {
|
||||
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue