diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php index 608b87dab7dd9e36706b55fa4a710263aff4adab..87d2342f0cf32cb31275e3bacdea529f734f6841 100644 --- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php +++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php @@ -5931,16 +5931,6 @@ class ContentObjectRenderer if ($addQueryParams === '&' || $addQueryParams[0] !== '&') { $addQueryParams = ''; } - if ($conf['useCacheHash']) { - $params = $tsfe->linkVars . $addQueryParams . '&id=' . $linkDetails['pageuid']; - if (trim($params, '& ') != '') { - /** @var $cacheHash CacheHashCalculator */ - $cacheHash = GeneralUtility::makeInstance(CacheHashCalculator::class); - $cHash = $cacheHash->generateForParameters($params); - $addQueryParams .= $cHash ? '&cHash=' . $cHash : ''; - } - unset($params); - } $targetDomain = ''; $currentDomain = (string)$this->getEnvironmentVariable('HTTP_HOST'); // Mount pages are always local and never link to another domain @@ -5982,6 +5972,16 @@ class ContentObjectRenderer $targetDomain = ''; } } + if ($conf['useCacheHash']) { + $params = $tsfe->linkVars . $addQueryParams . '&id=' . $page['uid']; + if (trim($params, '& ') != '') { + /** @var $cacheHash CacheHashCalculator */ + $cacheHash = GeneralUtility::makeInstance(CacheHashCalculator::class); + $cHash = $cacheHash->generateForParameters($params); + $addQueryParams .= $cHash ? '&cHash=' . $cHash : ''; + } + unset($params); + } $absoluteUrlScheme = 'http'; // URL shall be absolute: if (isset($conf['forceAbsoluteUrl']) && $conf['forceAbsoluteUrl'] || $page['url_scheme'] > 0) {