From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 9 Oct 2020 13:23:10 +0000 (+0200)
Subject: Return all keys in getAllVersions() instead
X-Git-Tag: v20.0.1RC1~3^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b1f3df3da35c7cea88dd43be575d02a1bfa6a6a;p=nextcloud-server.git

Return all keys in getAllVersions() instead

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 04bfa1c7c3f..43b2fef169c 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -496,7 +496,7 @@ class Storage {
 		$expiration = self::getExpiration();
 		$threshold = $expiration->getMaxAgeAsTimestamp();
 		$versions = self::getAllVersions($uid);
-		if (!$threshold || !array_key_exists('all', $versions)) {
+		if (!$threshold || empty($versions['all'])) {
 			return;
 		}
 
@@ -578,7 +578,10 @@ class Storage {
 		// newest version first
 		krsort($versions);
 
-		$result = [];
+		$result = [
+			'all' => [],
+			'by_file' => [],
+		];
 
 		foreach ($versions as $key => $value) {
 			$size = $view->filesize(self::VERSIONS_ROOT.'/'.$value['path'].'.v'.$value['timestamp']);
@@ -775,8 +778,8 @@ class Storage {
 
 			// if still not enough free space we rearrange the versions from all files
 			if ($availableSpace <= 0) {
-				$result = Storage::getAllVersions($uid);
-				$allVersions = $result['all'] ?? [];
+				$result = self::getAllVersions($uid);
+				$allVersions = $result['all'];
 
 				foreach ($result['by_file'] as $versions) {
 					list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);