From 9664eee19056d8e726078f4acb6e2f2862951ec8 Mon Sep 17 00:00:00 2001 From: Brian Shaughnessy Date: Tue, 1 Aug 2017 22:42:29 -0400 Subject: [PATCH 1/2] CRM-21004 only remove html snippet task if setting enabled --- CRM/UF/Page/Group.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CRM/UF/Page/Group.php b/CRM/UF/Page/Group.php index 265c2f659981..760e0e012afd 100644 --- a/CRM/UF/Page/Group.php +++ b/CRM/UF/Page/Group.php @@ -360,7 +360,11 @@ public function browse($action = NULL) { $action -= CRM_Core_Action::ADD; $action -= CRM_Core_Action::ADVANCED; $action -= CRM_Core_Action::BASIC; - $action -= CRM_Core_Action::PROFILE; + + //CRM-21004 + if (Civi::settings()->get('remote_profile_submissions')) { + $action -= CRM_Core_Action::PROFILE; + } } $ufGroup[$id]['group_type'] = self::formatGroupTypes($groupTypes); From b841e03f3754dadfab36ad5029cef080a1330882 Mon Sep 17 00:00:00 2001 From: Brian Shaughnessy Date: Wed, 2 Aug 2017 09:54:52 -0400 Subject: [PATCH 2/2] CRM-21004: change conditions under which we remove html snippet action --- CRM/UF/Page/Group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/UF/Page/Group.php b/CRM/UF/Page/Group.php index 760e0e012afd..e664706f4774 100644 --- a/CRM/UF/Page/Group.php +++ b/CRM/UF/Page/Group.php @@ -362,7 +362,7 @@ public function browse($action = NULL) { $action -= CRM_Core_Action::BASIC; //CRM-21004 - if (Civi::settings()->get('remote_profile_submissions')) { + if (array_key_exists(CRM_Core_Action::PROFILE, self::$_actionLinks)) { $action -= CRM_Core_Action::PROFILE; } }