FIX: better caching

sunnysideup · Feb 26, 2024 · fe986ea · fe986ea
1 parent ad3fadd
commit fe986ea
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/Extensions/ControllerExtension.php b/src/Extensions/ControllerExtension.php
@@ -22,8 +22,28 @@ public function onBeforeInit()
         if (Versioned::LIVE !== Versioned::get_stage()) {
             return;
         }
+        /** PageController|ControllerExtension $owner */
         $owner = $this->getOwner();
         if ($owner instanceof ContentController) {
+            $extend = $owner->extend('updateCacheControl');
+            if($extend) {
+                return;
+            }
+            if($owner->param('Action')) {
+                return;
+            }
+            if($owner->param('ID')) {
+                return;
+            }
+            if($owner->request->isAjax()) {
+                return;
+            }
+            if($owner->request->getVar('flush')) {
+                return;
+            }
+            if($owner->request->requestVars()) {
+                return;
+            }
             $dataRecord = $owner->dataRecord;
             if (empty($dataRecord)) {
                 return;
@@ -48,8 +68,6 @@ public function onBeforeInit()
                     ->publicCache(true)
                     ->setMaxAge($cacheTime)
                 ;
-            } else {
-                return null;
             }
         }
     }