[6.x] Restore selected site when resuming session#14562
Merged
jasonvarga merged 1 commit into6.xfrom Apr 28, 2026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request fixes an issue where the site switcher resets to the first site after session expiry, even though the UI still shows the previously selected site.
This was happening because when a user re-authenticates via the session expiry modal, a new server-side session is created without the
statamic.cp.selected-sitevalue. The Vue state still held the correct site, but the server defaulted to the first authorized site, causing a mismatch.This PR fixes it by restoring the selected site on the server after re-authentication, using the site handle still held in the frontend config.
Fixes #14400