Merge pull request #18836 from civicrm/5.31

[civicrm-core.git] / CRM / Contact / Form / Edit / TagsAndGroups.php

diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php
index a221a7eb924bd3371c13a8d095cb3a17f72e81b0..11bb704fca2518cfd87a927409ce572924f8cddd 100644 (file)
--- a/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -95,7 +95,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
         $attributes['skiplabel'] = TRUE;
         $elements = [];
         $groupsOptions = [];
-        foreach ($groups as $group) {
+        foreach ($groups as $key => $group) {
           $id = $group['id'];
           // make sure that this group has public visibility
           if ($visibility &&
@@ -105,7 +105,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
           }
 
           if ($groupElementType == 'select') {
-            $groupsOptions[$id] = $group;
+            $groupsOptions[$key] = $group;
           }
           else {
             $form->_tagGroup[$fName][$id]['description'] = $group['description'];