aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2014-10-10 17:31:26 +0200
committerBjörn Schießle <bjoern@schiessle.org>2014-10-10 17:31:26 +0200
commit3f9cab00e3b2763cbf265db8006f7df3885c6ee4 (patch)
treecf72239ca538cd6603bcc753bed7261c790339e9 /apps
parent87899db2048bc07a11b961e5c368b4be4ebcf413 (diff)
parent8e077cf1a4f1ff52aaaaaf359d6c85778fa51702 (diff)
downloadnextcloud-server-3f9cab00e3b2763cbf265db8006f7df3885c6ee4.tar.gz
nextcloud-server-3f9cab00e3b2763cbf265db8006f7df3885c6ee4.zip
Merge pull request #11507 from owncloud/versioning_expire
make sure that we always delete oldest first
Diffstat (limited to 'apps')
-rw-r--r--apps/files_versions/lib/versions.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 7fadf81426b..bdb26896948 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -517,6 +517,9 @@ class Storage {
// but always keep the two latest versions
$numOfVersions = count($allVersions) -2 ;
$i = 0;
+ // sort oldest first and make sure that we start at the first element
+ ksort($allVersions);
+ reset($allVersions);
while ($availableSpace < 0 && $i < $numOfVersions) {
$version = current($allVersions);
\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version']));