Disable template caching for tokenized requests

#12458
craftcms · Dec 23, 2022 · 8e1018e · 8e1018e
1 parent 09181ba
commit 8e1018e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Release Notes for Craft CMS 3.x
 
 ## Unreleased
+- Template caching is no longer enabled for tokenized requests. ([#12458](https://github.com/craftcms/cms/issues/12458))
 - Fixed an error that could occur when processing template caches in a console request, if a globally-scoped template cache was processed before it.
 
 ## 3.7.62 - 2022-12-13

diff --git a/src/services/TemplateCaches.php b/src/services/TemplateCaches.php
@@ -408,8 +408,14 @@ private function _isTemplateCachingEnabled(bool $global): bool
             if (!Craft::$app->getConfig()->getGeneral()->enableTemplateCaching) {
                 $this->_enabled = $this->_enabledGlobally = false;
             } else {
-                $this->_enabled = !Craft::$app->getRequest()->getIsConsoleRequest();
-                $this->_enabledGlobally = true;
+                // Don't enable template caches for tokenized requests
+                $request = Craft::$app->getRequest();
+                if ($request->getHadToken()) {
+                    $this->_enabled = $this->_enabledGlobally = false;
+                } else {
+                    $this->_enabled = !$request->getIsConsoleRequest();
+                    $this->_enabledGlobally = true;
+                }
             }
         }
         return $global ? $this->_enabledGlobally : $this->_enabled;