Merge pull request #11081 from owncloud/trash_fix_expire
also expire file if timestamp = limit, happens if trashbin_retention_obl...
This commit is contained in:
commit
ba5d3fb96b
|
@ -836,7 +836,7 @@ class Trashbin {
|
||||||
foreach ($files as $file) {
|
foreach ($files as $file) {
|
||||||
$timestamp = $file['mtime'];
|
$timestamp = $file['mtime'];
|
||||||
$filename = $file['name'];
|
$filename = $file['name'];
|
||||||
if ($timestamp < $limit) {
|
if ($timestamp <= $limit) {
|
||||||
$count++;
|
$count++;
|
||||||
$size += self::delete($filename, $user, $timestamp);
|
$size += self::delete($filename, $user, $timestamp);
|
||||||
\OC_Log::write('files_trashbin', 'remove "' . $filename . '" from trash bin because it is older than ' . $retention_obligation, \OC_log::INFO);
|
\OC_Log::write('files_trashbin', 'remove "' . $filename . '" from trash bin because it is older than ' . $retention_obligation, \OC_log::INFO);
|
||||||
|
|
Loading…
Reference in New Issue