Merge pull request #1531 from MetaModels/hotfix/fix_rights_for_non_admins_2

Fix rights check for non-admin user

Author: zonky2

src/CoreBundle/Contao/Hooks/ContentElementCallback.php

@@ -22,6 +22,7 @@
 
 namespace MetaModels\CoreBundle\Contao\Hooks;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Contao\DC_Table;
 
 /**
@@ -45,10 +46,15 @@ class ContentElementCallback extends AbstractContentElementAndModuleCallback
      */
     public function buildFilterParameterList(DC_Table $dataContainer)
     {
-        if (
-            null === ($currentRecord = $dataContainer->getCurrentRecord())
-            || $currentRecord['type'] !== 'metamodel_content'
-        ) {
+        try {
+            if (
+                null === ($currentRecord = $dataContainer->getCurrentRecord())
+                || $currentRecord['type'] !== 'metamodel_content'
+            ) {
+                return;
+            }
+        } catch (AccessDeniedException $exception) {
+            // If the access is denied, we don't want to build filter parameters.
             return;
         }
 

src/CoreBundle/Contao/Hooks/FilterContentElementCallback.php

@@ -19,6 +19,7 @@
 
 namespace MetaModels\CoreBundle\Contao\Hooks;
 
+use Contao\CoreBundle\Exception\AccessDeniedException;
 use Contao\DC_Table;
 
 /**
@@ -36,13 +37,17 @@ final class FilterContentElementCallback extends AbstractContentElementAndModule
     /** Called from tl_content.onload_callback. */
     public function buildFilterParameterList(DC_Table $dataContainer): void
     {
-        if (
-            null === ($currentRecord = $dataContainer->getCurrentRecord())
-            || $currentRecord['type'] !== 'metamodels_frontendfilter'
-        ) {
+        try {
+            if (
+                null === ($currentRecord = $dataContainer->getCurrentRecord())
+                || $currentRecord['type'] !== 'metamodels_frontendfilter'
+            ) {
+                return;
+            }
+        } catch (AccessDeniedException $exception) {
+            // If the access is denied, we don't want to build filter parameters.
             return;
         }
-
         $this->buildFilterParamsFor($dataContainer, 'metamodels_frontendfilter');
     }
 }