Merge pull request #37 from oveleon/patch/bugfixes

Fixes for Contao 5
oveleon · Mar 30, 2024 · 6fe43e3 · 6fe43e3
2 parents d377674 + a5fba6c
commit 6fe43e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/contao/dca/tl_content.php b/contao/dca/tl_content.php
@@ -87,7 +87,7 @@ public function checkPermission(): void
                 ;
 
                 /** @var SessionInterface $objSession */
-                $objSession = System::getContainer()->get('session');
+                $objSession = System::getContainer()->get('request_stack')->getSession();
 
                 $session = $objSession->all();
                 $session['CURRENT']['IDS'] = array_intersect((array) $session['CURRENT']['IDS'], $objCes->fetchEach('id'));

diff --git a/src/EventListener/GeneratePageListener.php b/src/EventListener/GeneratePageListener.php
@@ -22,6 +22,7 @@
 use Contao\PageModel;
 use Contao\PageRegular;
 use Contao\StringUtil;
+use Contao\System;
 use Oveleon\ContaoGlossaryBundle\Glossary;
 use Oveleon\ContaoGlossaryBundle\Model\GlossaryItemModel;
 use Oveleon\ContaoGlossaryBundle\Model\GlossaryModel;
@@ -139,7 +140,8 @@ public function __invoke(PageModel $pageModel, LayoutModel $layoutModel, PageReg
         $objTemplate->language = $pageModel->rootLanguage;
 
         // Disable glossary cache in contao debug mode
-        $objTemplate->cacheStatus = !Config::get('debugMode');
+        $blnDebug = System::getContainer()->getParameter('kernel.debug');
+        $objTemplate->cacheStatus = !$blnDebug;
 
         $objTemplate->glossaryConfig = $glossaryConfig;