diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-16 13:58:12 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-16 13:58:12 +0200 |
| commit | ba5d3fb96b7fdfee3ce2e1b2b4c0fd70af8170f4 (patch) | |
| tree | dad8e9da48ecc1c668c182dfe2910efbebe4afdd /apps/files_trashbin/lib/trashbin.php | |
| parent | 61b040cbe89d010a586fcd95ff8a65e40e4f0f44 (diff) | |
| parent | f23116ce50be0cbf1d50ea49fec1726f11225233 (diff) | |
| download | nextcloud-server-ba5d3fb96b7fdfee3ce2e1b2b4c0fd70af8170f4.tar.gz nextcloud-server-ba5d3fb96b7fdfee3ce2e1b2b4c0fd70af8170f4.zip | |
Merge pull request #11081 from owncloud/trash_fix_expire
also expire file if timestamp = limit, happens if trashbin_retention_obl...
Diffstat (limited to 'apps/files_trashbin/lib/trashbin.php')
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 12bf6a78114..5f1226d89d8 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -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); |