[Pkg-owncloud-commits] [owncloud] 77/258: also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 9bf1a18512a2f285ff153830cb92418f52a1a4a4
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Mon Sep 15 13:00:04 2014 +0200

    also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero
---
 apps/files_trashbin/lib/trashbin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index ee39693..4d2c53f 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git