Skip to content

Conversation

@CarlSchwan
Copy link
Member

@CarlSchwan CarlSchwan commented Dec 5, 2022

Fix #35347
Fix #35443

Manual backport of #31499

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@blizzz blizzz added this to the Nextcloud 25.0.2 milestone Dec 5, 2022
@blizzz blizzz added 3. to review Waiting for reviews bug labels Dec 5, 2022
@blizzz blizzz requested a review from juliusknorr December 5, 2022 14:56
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@szaimen szaimen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 5, 2022
$this->cache[$token->getToken()] = $token;
$this->rotate($token, $tokenId, $tokenId);
} catch (DoesNotExistException $ex2) {
$this->cache[$tokenHash] = $ex2;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$this->cache[$tokenHash] = $ex2;
$this->cache[$tokenHash] = $ex;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non-critical, ignoring for now for the approaching release

can be addressed afterwards

@PVince81
Copy link
Member

PVince81 commented Dec 5, 2022

/rebase

@PVince81
Copy link
Member

PVince81 commented Dec 5, 2022

since this partly affects external storages, let's rerun the tests once now that #35606 is merged

@PVince81 PVince81 mentioned this pull request Dec 5, 2022
1 task
juliusknorr and others added 5 commits December 5, 2022 16:10
Signed-off-by: Julius Härtl <[email protected]>
(cherry picked from commit 81f8719)
Signed-off-by: Julius Härtl <[email protected]>
(cherry picked from commit 553cb49)
Signed-off-by: Julius Härtl <[email protected]>
(cherry picked from commit a6796b4)
Signed-off-by: Carl Schwan <[email protected]>
(cherry picked from commit 01e2a26)
Co-authored-by: Joas Schilling <[email protected]>
Signed-off-by: Carl Schwan <[email protected]>
(cherry picked from commit ef31396)
@PVince81 PVince81 merged commit 9eb99ec into stable25 Dec 5, 2022
@PVince81 PVince81 deleted the backport/stable25/31499 branch December 5, 2022 19:02
@blizzz blizzz mentioned this pull request Dec 6, 2022
1 task
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 bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants