From 36111e9fa159cbf5697562eba9147d2022be27d1 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 16 Mar 2020 11:03:55 +1100 Subject: [PATCH] [REF] Fix permission check for system workflow message created --- CRM/Core/BAO/MessageTemplate.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index 71f06c8767..9b5ca62820 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -87,10 +87,12 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { } } else { - if (!empty($params['workflow_id']) && !CRM_Core_Permission::check('edit system workflow message templates')) { - throw new \Civi\API\Exception\UnauthorizedException(ts('%1', [1 => $systemWorkflowPermissionDeniedMessage])); + if (!empty($params['workflow_id'])) { + if (!CRM_Core_Permission::check('edit system workflow message templates')) { + throw new \Civi\API\Exception\UnauthorizedException(ts('%1', [1 => $systemWorkflowPermissionDeniedMessage])); + } } - if (!CRM_Core_Permission::check('edit user-driven message templates')) { + elseif (!CRM_Core_Permission::check('edit user-driven message templates')) { throw new \Civi\API\Exception\UnauthorizedException(ts('%1', [1 => $userWorkflowPermissionDeniedMessage])); } } -- 2.25.1