Преглед изворни кода

Return all keys in getAllVersions() instead

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
tags/v21.0.0beta1
Morris Jobke пре 3 година
родитељ
комит
6ce05bc7d7
No account linked to committer's email address
1 измењених фајлова са 7 додато и 4 уклоњено
  1. 7
    4
      apps/files_versions/lib/Storage.php

+ 7
- 4
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);

Loading…
Откажи
Сачувај