summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-09-15 13:00:04 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-09-15 13:00:04 +0200
commitf23116ce50be0cbf1d50ea49fec1726f11225233 (patch)
treec1081f9104928963360ed7cbbeb031ea6ffc9873 /apps/files_trashbin
parent31898aa63548be8492b826b9bac6dc0f8bca8dee (diff)
downloadnextcloud-server-f23116ce50be0cbf1d50ea49fec1726f11225233.tar.gz
nextcloud-server-f23116ce50be0cbf1d50ea49fec1726f11225233.zip
also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/lib/trashbin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 69eef09d1e9..dc90eadc8da 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -799,7 +799,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);