Simplify the pageModel getter

contao · Jan 29, 2024 · a0245b5 · a0245b5
1 parent d0d10dd
commit a0245b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/core-bundle/config/services.yaml b/core-bundle/config/services.yaml
@@ -1205,7 +1205,6 @@ services:
     contao.twig.global.variable:
         class: Contao\CoreBundle\Twig\Global\ContaoVariable
         arguments:
-            - '@contao.framework'
             - '@request_stack'
             - '@contao.security.token_checker'
             - '@contao.csrf.token_manager'

diff --git a/core-bundle/src/Twig/Global/ContaoVariable.php b/core-bundle/src/Twig/Global/ContaoVariable.php
@@ -5,15 +5,13 @@
 namespace Contao\CoreBundle\Twig\Global;
 
 use Contao\CoreBundle\Csrf\ContaoCsrfTokenManager;
-use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;
 use Contao\PageModel;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 class ContaoVariable
 {
     public function __construct(
-        private readonly ContaoFramework $framework,
         private readonly RequestStack $requestStack,
         private readonly TokenChecker $tokenChecker,
         private readonly ContaoCsrfTokenManager $tokenManager,
@@ -22,29 +20,13 @@ public function __construct(
 
     public function getPage(): PageModel|null
     {
-        $request = $this->requestStack->getCurrentRequest();
-
-        if (!$request || !$request->attributes->has('pageModel')) {
-            return null;
-        }
-
-        $pageModel = $request->attributes->get('pageModel');
+        $pageModel = $this->requestStack->getCurrentRequest()?->attributes->get('pageModel');
 
         if ($pageModel instanceof PageModel) {
-            return $pageModel;
-        }
-
-        if (
-            isset($GLOBALS['objPage'])
-            && $GLOBALS['objPage'] instanceof PageModel
-            && (int) $GLOBALS['objPage']->id === (int) $pageModel
-        ) {
-            return $GLOBALS['objPage'];
+            return null;
         }
 
-        $this->framework->initialize();
-
-        return $this->framework->getAdapter(PageModel::class)->findByPk((int) $pageModel);
+        return $pageModel;
     }
 
     public function getHas_backend_user(): bool