#12017 leave only ->whereHas(userUserGroups

Author: bozana

classes/security/Validation.php

@@ -503,14 +503,10 @@ public static function getAdministrationLevel(
 
         // single query to fetch user groups assigned to either user
         $allUserGroups = UserGroup::query()
-            ->whereHas(
-                'userUserGroups',
-                fn ($q) =>
-                $q->withActive()->withUserIds([$administratorUserId, $administeredUserId])
-            )
-            ->with(['userUserGroups' => fn ($q) =>
-                $q->withActive()->withUserIds([$administratorUserId, $administeredUserId])
-            ])
+            ->whereHas('userUserGroups', function ($query) use ($administratorUserId, $administeredUserId) {
+                $query->withUserIds([$administratorUserId, $administeredUserId])
+                    ->withActive();
+            })
             ->get();
 
         $administratorMap = [];