From 083719752d6c35c10c485d3e10ed9464092ebf8d Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Wed, 18 Mar 2020 22:39:17 +0100
Subject: [PATCH] [BUGFIX] Ensure cache tags are available on cached pages
When fetching a page from cache, the information which cache
tags were used are not available anymore for any hooks in extensions
(e.g. static_filecache).
Resolves: #90775
Releases: master, 9.5
Change-Id: Ib1ca0f256411a2d979113ddbb0ef128bc79a0197
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63768
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Susanne Moog <look@susi.dev>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Susanne Moog <look@susi.dev>
---
.../Classes/Controller/TypoScriptFrontendController.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index fb607a0b962f..ef7f4b153ffc 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -1924,6 +1924,8 @@ class TypoScriptFrontendController implements LoggerAwareInterface
// Setting flag, so we know, that some cached content has been loaded
$this->cacheContentFlag = true;
$this->cacheExpires = $cachedData['expires'];
+ // Restore the current tags as they can be retrieved by getPageCacheTags()
+ $this->pageCacheTags = $cachedData['cacheTags'] ?? [];
// Restore page title information, this is needed to generate the page title for
// partially cached pages.
@@ -2604,6 +2606,8 @@ class TypoScriptFrontendController implements LoggerAwareInterface
$tags = GeneralUtility::trimExplode(',', $this->page['cache_tags'], true);
$this->pageCacheTags = array_merge($this->pageCacheTags, $tags);
}
+ // Add the cache themselves as well, because they are fetched by getPageCacheTags()
+ $cacheData['cacheTags'] = $this->pageCacheTags;
$this->pageCache->set($this->newHash, $cacheData, $this->pageCacheTags, $expirationTstamp - $GLOBALS['EXEC_TIME']);
}
--
GitLab