Skip to content

[stable25] Catch more invalid cache source storage paths#39731

Merged
blizzz merged 2 commits intostable25from
backport/39698/stable25
Sep 5, 2023
Merged

[stable25] Catch more invalid cache source storage paths#39731
blizzz merged 2 commits intostable25from
backport/39698/stable25

Conversation

@backportbot-nextcloud
Copy link

Backport of #39698

joshtrichards and others added 2 commits August 6, 2023 08:46
OC\Files\Cache\Cache::get can return string|false|null, not just string|false.

- #26270 added handling of false, but null is needed too.
- Well, or we change the default $resullt to false, but I'm not sure if that has other ramifications and the real need here is to simply catch situations where the cache source storage path is not valid for whatever reason

Related: #19009

Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
Co-authored-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
@skjnldsv skjnldsv added the 4. to release Ready to be released and/or waiting for tests to finish label Aug 6, 2023
@skjnldsv skjnldsv requested a review from solracsf August 6, 2023 09:08
@blizzz blizzz mentioned this pull request Sep 5, 2023
@blizzz blizzz merged commit e004f80 into stable25 Sep 5, 2023
@blizzz blizzz deleted the backport/39698/stable25 branch September 5, 2023 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants