From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 15 Sep 2014 11:00:04 +0000 (+0200)
Subject: also expire file if timestamp = limit, happens if trashbin_retention_obligation is... 
X-Git-Tag: v8.0.0alpha1~688^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f23116ce50be0cbf1d50ea49fec1726f11225233;p=nextcloud-server.git

also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero
---

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);