diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-04-18 11:54:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 11:54:19 +0300 |
| commit | 64196ddd19684b6a218428eeb6ee370d0514b68c (patch) | |
| tree | 23f69c1fd303fc259522ca990e7bbe4987ed32c3 | |
| parent | ad603fd13afaf6bfc80e78c2a141b439a403cbd6 (diff) | |
| parent | b6c76f43a17822bc0d7eee0270e0c00bd6325865 (diff) | |
Merge pull request #20449 from liamjack/fix/19066/empty_file_versions
Array offset error due to empty file versions array
| -rw-r--r-- | apps/files_versions/lib/Storage.php | 5 | ||||
| -rw-r--r-- | apps/files_versions/tests/VersioningTest.php | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index cb5a02581b5..2b896a0cf67 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -641,6 +641,11 @@ class Storage { } $firstVersion = reset($versions); + + if ($firstVersion === false) { + return [$toDelete, $size]; + } + $firstKey = key($versions); $prevTimestamp = $firstVersion['version']; $nextVersion = $firstVersion['version'] - $step; diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index 26429574364..b6d317ea25e 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -274,6 +274,11 @@ class VersioningTest extends \Test\TestCase { ], 9 // size of all deleted files (every file has the size 1) ], + // fourth set of versions: empty (see issue #19066) + [ + [], + 0 + ] ]; } |