diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-10-09 15:23:10 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-10-13 15:39:33 +0000 |
| commit | 2b1f3df3da35c7cea88dd43be575d02a1bfa6a6a (patch) | |
| tree | 5331bfe65c6320357fd3f32580c1da9e39463daf /apps/files_versions | |
| parent | 8a25ded7585871ce579d6439baf58c5cd0f6812b (diff) | |
| download | nextcloud-server-2b1f3df3da35c7cea88dd43be575d02a1bfa6a6a.tar.gz nextcloud-server-2b1f3df3da35c7cea88dd43be575d02a1bfa6a6a.zip | |
Return all keys in getAllVersions() instead
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/lib/Storage.php | 11 |
1 files changed, 7 insertions, 4 deletions
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); |