Merge pull request #10377 from bozana/10375

#10375 Corectly consider roles removed from masthead with …
pkp · Sep 9, 2024 · eb38e39 · eb38e39
2 parents d33f414 + 1765240
commit eb38e39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/components/forms/context/PKPAppearanceMastheadForm.php b/classes/components/forms/context/PKPAppearanceMastheadForm.php
@@ -52,7 +52,7 @@ public function __construct($action, $locales, $context)
             ->toArray();
 
         // sort the mashead roles in their saved order
-        $sortedAllMastheadUserGroups = array_replace(array_flip($savedMastheadUserGroupIdsOrder), $allMastheadUserGroups);
+        $sortedAllMastheadUserGroups = array_replace(array_intersect_key(array_flip($savedMastheadUserGroupIdsOrder), $allMastheadUserGroups), $allMastheadUserGroups);
 
         foreach ($sortedAllMastheadUserGroups as $userGroup) {
             $mastheadOptions[] = [

diff --git a/pages/about/AboutContextHandler.php b/pages/about/AboutContextHandler.php
@@ -83,7 +83,7 @@ public function editorialMasthead($args, $request)
             ->toArray();
 
         // sort the masthead roles in their saved order for display
-        $mastheadRoles = array_replace(array_flip($savedMastheadUserGroupIdsOrder), $allMastheadUserGroups);
+        $mastheadRoles = array_replace(array_intersect_key(array_flip($savedMastheadUserGroupIdsOrder), $allMastheadUserGroups), $allMastheadUserGroups);
 
         $allUsersIdsGroupedByUserGroupId = Repo::userGroup()->getMastheadUserIdsByRoleIds($mastheadRoles, $context->getId());
 
@@ -152,7 +152,7 @@ public function editorialHistory($args, $request)
             ->toArray();
 
         // sort the masthead roles in their saved order for display
-        $mastheadRoles = array_replace(array_flip($savedMastheadUserGroupIdsOrder), $allMastheadUserGroups);
+        $mastheadRoles = array_replace(array_intersect_key(array_flip($savedMastheadUserGroupIdsOrder), $allMastheadUserGroups), $allMastheadUserGroups);
 
         $allUsersIdsGroupedByUserGroupId = Repo::userGroup()->getMastheadUserIdsByRoleIds($mastheadRoles, $context->getId(), UserUserGroupStatus::STATUS_ENDED);