Revert back

civicrm · Dec 9, 2020 · c3485f1 · c3485f1
1 parent aa72bcb
commit c3485f1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
@@ -1466,13 +1466,15 @@ public static function add(&$params, $ids = []) {
     $ufGroup = new CRM_Core_DAO_UFGroup();
     $ufGroup->copyValues($params);
 
-    if (empty($params['name'])) {
+    $ufGroupID = CRM_Utils_Array::value('ufgroup', $ids, CRM_Utils_Array::value('id', $params));
+    if (!$ufGroupID && empty($params['name'])) {
       $ufGroup->name = CRM_Utils_String::munge($ufGroup->title, '_', 56);
     }
+    $ufGroup->id = $ufGroupID;
 
     $ufGroup->save();
 
-    if (empty($params['name'])) {
+    if (!$ufGroupID && empty($params['name'])) {
       $ufGroup->name = $ufGroup->name . "_{$ufGroup->id}";
       $ufGroup->save();
     }