Fix content controller to check published before last modified (#276)

softspring · Jun 4, 2024 · b702e2a · b702e2a
1 parent 349766f
commit b702e2a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Controller/ContentController.php b/src/Controller/ContentController.php
@@ -22,8 +22,15 @@ public function renderRoutePath(RoutePathInterface $routePath, Request $request)
 
         $response = new Response();
 
+        /** @var ?ContentVersionInterface $publishedVersion */
+        $publishedVersion = $content->getPublishedVersion();
+
+        if (!$publishedVersion) {
+            throw $this->createNotFoundException();
+        }
+
         if ($this->contentCacheLastModifiedEnabled) {
-            $response->setEtag(md5($content->getId().$content->getLastModified()?->getTimestamp().$this->contentVersionCompiler->getCompileKeyFromRequest($content->getPublishedVersion(), $request)));
+            $response->setEtag(md5($content->getId().$content->getLastModified()?->getTimestamp().$this->contentVersionCompiler->getCompileKeyFromRequest($publishedVersion, $request)));
             $response->setLastModified($content->getLastModified());
             // Set response as public. Otherwise it will be private by default.
             $response->setPublic();
@@ -32,13 +39,6 @@ public function renderRoutePath(RoutePathInterface $routePath, Request $request)
             }
         }
 
-        /** @var ?ContentVersionInterface $publishedVersion */
-        $publishedVersion = $content->getPublishedVersion();
-
-        if (!$publishedVersion) {
-            throw $this->createNotFoundException();
-        }
-
         $pageContent = $this->contentVersionManager->getCompiledContent($publishedVersion, $request);
 
         // create response