Allow fe_group modification when indexing restricted subpage

Fixes TYPO3-Solr#3969
deschilter · Feb 27, 2024 · aef7dcd · aef7dcd
1 parent 46ced72
commit aef7dcd
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/Classes/EventListener/PageIndexer/FrontendGroupsModifier.php b/Classes/EventListener/PageIndexer/FrontendGroupsModifier.php
@@ -40,15 +40,19 @@ class FrontendGroupsModifier
     public function __invoke(ModifyResolvedFrontendGroupsEvent $event): void
     {
         $pageIndexerRequest = $event->getRequest()->getAttribute('solr.pageIndexingInstructions');
-        if (!$pageIndexerRequest instanceof PageIndexerRequest
-            || (
-                (int)$pageIndexerRequest->getParameter('userGroup') === 0
-                && (
-                    (int)$pageIndexerRequest->getParameter('pageUserGroup') !== -2
-                    &&
-                    (int)$pageIndexerRequest->getParameter('pageUserGroup') < 1
-                )
+        if (!$pageIndexerRequest instanceof PageIndexerRequest) {
+            return;
+        }
+
+        $groups = $this->resolveFrontendUserGroups($pageIndexerRequest);
+
+        if ((int)$pageIndexerRequest->getParameter('userGroup') === 0
+            && (
+                (int)$pageIndexerRequest->getParameter('pageUserGroup') !== -2
+                &&
+                (int)$pageIndexerRequest->getParameter('pageUserGroup') < 1
             )
+            && count($groups) === 0
         ) {
             return;
         }
@@ -76,7 +80,6 @@ public function __invoke(ModifyResolvedFrontendGroupsEvent $event): void
             );
         }
 
-        $groups = $this->resolveFrontendUserGroups($pageIndexerRequest);
         if ((int)$pageIndexerRequest->getParameter('pageUserGroup') > 0) {
             $groups[] = (int)$pageIndexerRequest->getParameter('pageUserGroup');
         }