CRM-14062 rework group name param check so we still allow appending ID via UI

diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php
index f086190c481a50ce38ef2d7aabb8847460d55d1b..9a18004208d9bc4ca239ab55688fb253b9ea64e3 100644 (file)
--- a/CRM/Contact/BAO/Group.php
+++ b/CRM/Contact/BAO/Group.php
@@ -354,7 +354,8 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
     }
 
     // form the name only if missing: CRM-627
-    if (!CRM_Utils_Array::value('name', $params) &&
+    $nameParam = CRM_Utils_Array::value('name', $params, NULL);
+    if (!$nameParam &&
       !CRM_Utils_Array::value('id', $params)
     ) {
       $params['name'] = CRM_Utils_String::titleToVar($params['title']);
@@ -390,7 +391,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
       ) . CRM_Core_DAO::VALUE_SEPARATOR;
     }
     if (!CRM_Utils_Array::value('id', $params) &&
-      !CRM_Utils_Array::value('name', $params)
+      !$nameParam
     ) {
       $group->name .= "_tmp";
     }
@@ -401,7 +402,7 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
     }
 
     if (!CRM_Utils_Array::value('id', $params) &&
-      !CRM_Utils_Array::value('name', $params)
+      !$nameParam
     ) {
       $group->name = substr($group->name, 0, -4) . "_{$group->id}";
     }