Browse Source
Return all keys in getAllVersions() instead
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
pull/23295/head
Morris Jobke
6 years ago
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
1 changed files with
7 additions and
4 deletions
-
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); |
|
|
|
|