sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert(trashbin): 195d347 due to misunderstanding 

See https://github.com/nextcloud/documentation/pull/13017#issuecomment-3425782690

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
pull/55908/head
Thomas Citharel 2025-10-22 15:17:37 +07:00 committed by Louis
parent ed1647b80d
commit 29d72bfb32
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files_trashbin/lib/Trashbin.php
Unescape Escape View File

@ -844,7 +844,7 @@ class Trashbin implements IEventListener {
$dirContent = Helper::getTrashFiles('/', $user, 'mtime');
// delete all files older then $retention_obligation
[$delSize, $count] = self::deleteExpiredFiles($dirContent, $user, $availableSpace <= 0);
[$delSize, $count] = self::deleteExpiredFiles($dirContent, $user);
$availableSpace += $delSize;
@ -906,10 +906,9 @@ class Trashbin implements IEventListener {
*
* @param array $files list of files sorted by mtime
* @param string $user
* @param bool $quotaExceeded
* @return array{int|float, int} size of deleted files and number of deleted files
*/
public static function deleteExpiredFiles($files, $user, bool $quotaExceeded = false) {
public static function deleteExpiredFiles($files, $user) {
/** @var Expiration $expiration */
$expiration = Server::get(Expiration::class);
$size = 0;
@ -917,7 +916,7 @@ class Trashbin implements IEventListener {
foreach ($files as $file) {
$timestamp = $file['mtime'];
$filename = $file['name'];
if ($expiration->isExpired($timestamp, $quotaExceeded)) {
if ($expiration->isExpired($timestamp)) {
try {
$size += self::delete($filename, $user, $timestamp);
$count++;