Review 14.3 Merged

95590[BUGFIX] Avoid fatal error for unresolvable MountPoint site

Garvin Hicking CR +2 V +2 Easy +27 −13 updated 09/03/26, 07:34

Commit message

Generating a link with an 'MP' parameter for a non-default language
throws an uncaught InvalidArgumentException if the MountPoint page no longer resolves to any site, since SiteMatcher::matchByPageId() then returns a NullSite, which only knows language 0.

PageRouter now checks the resolved site's available languages and falls back to the requested language if it is not available there.

Drive-by fix: Since SiteMatcher::matchByPageId() by itself catches the SiteNotFoundException and returns a NullSite, existing try/catch blocks in consumers of that method are now removed.

Review

  • Code review CR +2 Done
    • Garvin Hicking +2
  • Verified V +2 Done
    • Garvin Hicking +2
    • core-ci +1 CI

Issues 1

Files 3

Review log 34

  1. Garvin Hicking commented on patch set 1 09/03/26, 07:10

    Cherry Picked from branch main.
  2. core-ci voted on patch set 1 V +1 09/03/26, 07:18 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/107723

  3. Garvin Hicking voted on patch set 1 CR +2 V +2 09/03/26, 07:34

  4. Garvin Hicking merged patch set 2 09/03/26, 07:34