From: Björn Schießle <schiessle@owncloud.com>
Date: Mon, 4 Mar 2013 16:20:14 +0000 (+0100)
Subject: fix expire function
X-Git-Tag: v5.0.0RC2~12^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=70014d37dcf1cd693d8b8ce723afcfcc3d6d24aa;p=nextcloud-server.git

fix expire function
---

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 178ef722735..c37133cf32c 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -442,12 +442,12 @@ class Storage {
 				}
 			}
 
-			// check if enough space is available after versions are rearranged.
-			// if not we delete the oldest versions until we meet the size limit for versions
-			$numOfVersions = count($all_versions);
+			// Check if enough space is available after versions are rearranged.
+			// If not we delete the oldest versions until we meet the size limit for versions,
+			// but always keep the two latest versions
+			$numOfVersions = count($all_versions) -2 ;
 			$i = 0;
-			while ($availableSpace < 0) {
-				if ($i = $numOfVersions-2) break; // keep at least the last version
+			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']);
 				$versionsSize -= $all_versions[$i]['size'];
 				$availableSpace += $all_versions[$i]['size'];