Skip to content

Commit

Permalink
[BUGFIX] Use correct configuration for typo3/cms-frontend/base-redire…
Browse files Browse the repository at this point in the history
…ct-resolver

The middleware "typo3/cms-frontend/base-redirect-resolver" should use
"typo3/cms-frontend/site" instead of the not known
"typo3/cms-frontend/site-resolver" for the after configuration.

Resolves: #91846
Releases: master
Change-Id: I3988699ce04a7bde009c1d3f7409af280da1408a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/65078
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
  • Loading branch information
georgringer authored and ervaude committed Sep 30, 2020
1 parent 6312ab5 commit 7a0b3c2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -92,7 +92,7 @@
"phpspec/prophecy": "^1.7.5",
"phpstan/phpstan": "^0.12.44",
"typo3/cms-styleguide": "~11.0.0",
"typo3/testing-framework": "^6.4.2"
"typo3/testing-framework": "^6.4.3"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
Expand Down
19 changes: 12 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
Expand Up @@ -72,7 +72,7 @@
"phpspec/prophecy": "^1.7.5",
"phpstan/phpstan": "^0.12.44",
"typo3/cms-styleguide": "~11.0.0",
"typo3/testing-framework": "^6.4.2"
"typo3/testing-framework": "^6.4.3"
},
"suggest": {
"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/frontend/Configuration/RequestMiddlewares.php
Expand Up @@ -67,7 +67,7 @@
'typo3/cms-frontend/base-redirect-resolver' => [
'target' => \TYPO3\CMS\Frontend\Middleware\SiteBaseRedirectResolver::class,
'after' => [
'typo3/cms-frontend/site-resolver',
'typo3/cms-frontend/site',
],
'before' => [
'typo3/cms-frontend/static-route-resolver'
Expand Down

0 comments on commit 7a0b3c2

Please sign in to comment.