Skip to content

IBX-8074: Merged branch '4.6' into 5.0 - #819

Merged
Steveb-p merged 2 commits into
5.0from
merge/4.6-to-5.0
Sep 7, 2026
Merged

Steveb-p merged 2 commits into
5.0from
merge/4.6-to-5.0

Conversation

@Steveb-p

@Steveb-p Steveb-p commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Caution

This is a merge pull request

🎫 Issue IBX-8074

Related PRs:

…#806)

getCurrent() only ever reflected the value set once via the shared
SiteAccessAware::setSiteAccess() singleton, so it never picked up a scope
change dispatched by ContentPreviewHelper or ConsoleCommandListener. It now
keeps a small stack, pushing on CONFIG_SCOPE_CHANGE and popping on
CONFIG_SCOPE_RESTORE.
# Conflicts:
#	src/lib/MVC/Symfony/SiteAccess/SiteAccessService.php
@Steveb-p Steveb-p added the Fast-forward merge PR should be merged in a fast-forward way label Sep 7, 2026
@sonarqubecloud

sonarqubecloud Bot commented Sep 7, 2026

Copy link
Copy Markdown

@Steveb-p
Steveb-p marked this pull request as ready for review September 7, 2026 10:34
@Steveb-p
Steveb-p merged commit 859d641 into 5.0 Sep 7, 2026
16 of 18 checks passed
@Steveb-p
Steveb-p deleted the merge/4.6-to-5.0 branch September 7, 2026 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fast-forward merge PR should be merged in a fast-forward way

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants