Skip to content

Commit 928c41e

Browse files
smichaelsenNamelessCoder
authored andcommitted
[BUGFIX] Avoid relying on PageArguments in AssetService
The routing request argument isn't necessarily a PageArguments instance.
1 parent aacea57 commit 928c41e

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Classes/Service/AssetService.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use TYPO3\CMS\Core\Cache\CacheManager;
1717
use TYPO3\CMS\Core\Log\LogManager;
1818
use TYPO3\CMS\Core\Routing\PageArguments;
19+
use TYPO3\CMS\Core\Routing\RouteResultInterface;
1920
use TYPO3\CMS\Core\SingletonInterface;
2021
use TYPO3\CMS\Core\Utility\ArrayUtility;
2122
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -858,8 +859,11 @@ protected function readPageUidFromContext(): int
858859
/** @var ServerRequestInterface $serverRequest */
859860
$serverRequest = $GLOBALS['TYPO3_REQUEST'];
860861

861-
/** @var PageArguments $pageArguments */
862+
/** @var RouteResultInterface $pageArguments */
862863
$pageArguments = $serverRequest->getAttribute('routing');
864+
if (!$pageArguments instanceof PageArguments) {
865+
return 0;
866+
}
863867
return $pageArguments->getPageId();
864868
}
865869

0 commit comments

Comments
 (0)