Review main Merged

93273[BUGFIX] Fix site route matching for slugs identical to site path

Franz Kugelmann CR +2 V +2 Easy +39 −1 updated 05/07/26, 09:58

Commit message

In multi-site-setup with configured base like this:
first site - base: /
second site - base: /t3/

AND the first subpage of the second site has the title t3,
this results correctly to slug
/t3/t3/

To make sure the route is correctly matched with two identical parts,
the tail must be searched from the right end of the slug.

Review

  • Code review CR +2 Done
    • Stefan Bürk +2
    • Georg Ringer +1
    • Garvin Hicking +1
  • Verified V +2 Done
    • Stefan Bürk +2
    • Georg Ringer +1
    • Garvin Hicking +1
    • core-ci +1 CI

Issues 1

Files 4

Review log 1218

  1. Franz Kugelmann uploaded patch set 1 03/19/26, 09:53

  2. core-ci voted on patch set 1 V +1 03/19/26, 10:06 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/98227

  3. Franz Kugelmann updated the commit message in patch set 2 V +1 03/19/26, 10:10

  4. core-ci voted on patch set 2 V -1 03/19/26, 10:22 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/98228

  5. Franz Kugelmann commented on patch set 2 03/19/26, 13:54

    recheck pipeline error
  6. core-ci commented on patch set 2 03/19/26, 18:29 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/98228

  7. Garvin Hicking commented on patch set 2 03/19/26, 18:56

    I think this is quite a potential influential patch. We would need to cover this issue with a regression functional test, so a test that fails without the patch, but succeeds with the patch applied. Are you interested in looking into this maybe? An entry point would be `SiteMatcher->matchSiteByUri` which is a subject under test in: - typo3/sysext/core/Tests/Functional/DataHandling/Regular/MultiSite/MultiSiteTest.php - typo3/sysext/core/Tests/Unit/Routing/SiteMatcherTest.php - typo3/sysext/frontend/Tests/Unit/Middleware/SiteResolverTest.php - typo3/sysext/redirects/Tests/Functional/Service/SlugServiceTest.php

    Reply

    I've restarted the job. It's quite flakey currently sadly.
  8. core-ci voted on patch set 2 V +1 03/19/26, 18:57 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/98228

  9. Benni Mack updated the commit message in patch set 3 V +1 04/22/26, 06:26

  10. core-ci voted on patch set 3 V +1 04/22/26, 06:54 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100701

  11. Georg Ringer uploaded patch set 4 V +1 05/05/26, 01:06

  12. Georg Ringer voted on patch set 4 CR +1 V +1 05/05/26, 01:06

  13. core-ci voted on patch set 4 V +1 05/05/26, 01:42 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/101511

  14. Garvin Hicking commented on patch set 4 CR +1 V +1 05/05/26, 06:59

    Reply

    Done
  15. Stefan Bürk commented on patch set 4 CR -1 05/05/26, 07:04

    Reviewing ...
  16. Stefan Bürk commented on patch set 4 CR +1 V +1 05/07/26, 08:52

    Reply

    Sorry for the delay.
  17. Stefan Bürk voted on patch set 4 CR +2 V +2 05/07/26, 09:01

  18. Stefan Bürk merged patch set 5 05/07/26, 09:58