Merge conflict Gerrit cannot merge this change. It needs a rebase onto main.

Review main Work in progress Quiet

95396[BUGFIX] Apply site settings without a manual cache flush

Benjamin Kott CR 0 V 0 Hard +342 −3 updated 10/08/26, 13:11

Commit message

Site settings and the constants.typoscript and setup.typoscript files
of a site end up in the rendered page, but none of the identifiers the
"typoscript" cache and the page cache store the results under depends
on them. The include tree nodes of a site and of a sys_template record
with the clear flag set, the ASTs the frontend TypoScript factory
derives from them and the page cache identifier are keyed on the site
identifier and the sys_template rows only. A changed setting or site
TypoScript file is therefore not rendered until the "pages" cache group
is flushed by hand, whether it was saved in the site settings editor or
deployed.

The site configuration cache now carries a hash of the resolved
settings and the TypoScript files of each site, calculated once when
the cache is built. All these identifiers include that hash, so nothing
is calculated per request and no page cache needs to be flushed.

Test this change

Run a command in your clone of the TYPO3 Core. Then try what the change does and vote on Verified in Gerrit. How to review a patch

Check out patch set 4
git fetch https://review.typo3.org/Packages/TYPO3.CMS refs/changes/96/95396/4 && git checkout FETCH_HEAD
Cherry-pick onto main
git fetch https://review.typo3.org/Packages/TYPO3.CMS refs/changes/96/95396/4 && git cherry-pick FETCH_HEAD

Review

  • Code review CR 0 Needs a vote
  • Verified V 0 Needs a vote
    • core-ci +1 CI

Issues 1

Files 11

Review log 59

  1. Benjamin Kott uploaded patch set 1 08/24/26, 13:29

  2. core-ci voted on patch set 1 V +1 08/24/26, 13:36 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/107039

  3. Garvin Hicking commented on patch set 1 08/24/26, 22:26

    SysTemplateTreeBuilder.php:127 Unresolved

    how about using the timestamp of the settings file instead? I feel like this variant might have an unneeded performance impact, since it is performed for a cache check already? Did you by chance run benchmarks on a possible impact?
  4. Benjamin Kott uploaded patch set 2 V +1 10/08/26, 09:18

  5. core-ci voted on patch set 2 V +1 10/08/26, 09:26 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/110472

  6. Benjamin Kott uploaded patch set 3 V +1 10/08/26, 11:54

  7. core-ci voted on patch set 3 V +1 10/08/26, 12:04 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/110486

  8. Benjamin Kott uploaded patch set 4 V +1 10/08/26, 12:58

  9. core-ci voted on patch set 4 V +1 10/08/26, 13:11 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/110493