From e2b7c67d7f20a71c05f9b5d218fb66f063a0605f Mon Sep 17 00:00:00 2001 From: Brian Shaughnessy Date: Fri, 10 Jan 2014 14:37:44 -0500 Subject: [PATCH] CRM-14062 rework group name param check so we still allow appending ID via UI --- CRM/Contact/BAO/Group.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php index f086190c48..9a18004208 100644 --- 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}"; } -- 2.25.1