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:
Lukas Reschke 2014-09-16 13:58:12 +02:00
commit ba5d3fb96b
1 changed files with 1 additions and 1 deletions

View File

@ -836,7 +836,7 @@ class Trashbin {
foreach ($files as $file) {
$timestamp = $file['mtime'];
$filename = $file['name'];
if ($timestamp < $limit) {
if ($timestamp <= $limit) {
$count++;
$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);