From 1d2214da73e449f008753f32823415ad26b67f60 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 22 Sep 2021 09:33:44 +1200 Subject: [PATCH] Remove deprecated code lines These have been deprecated for around 8 months , are not used in core, and are in code where 5.43 will already require extra testing so let's remove so we can simplify --- CRM/Core/BAO/MessageTemplate.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index 9c485e0948..802a3f822f 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -344,10 +344,6 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { $params = array_merge($modelDefaults, $viewDefaults, $envelopeDefaults, $params); CRM_Utils_Hook::alterMailParams($params, 'messageTemplate'); - if (!is_int($params['messageTemplateID']) && !is_null($params['messageTemplateID'])) { - CRM_Core_Error::deprecatedWarning('message template id should be an integer'); - $params['messageTemplateID'] = (int) $params['messageTemplateID']; - } $mailContent = self::loadTemplate((string) $params['valueName'], $params['isTest'], $params['messageTemplateID'] ?? NULL, $params['groupName'] ?? '', $params['messageTemplate'], $params['subject'] ?? NULL); $params['tokenContext'] = array_merge([ -- 2.25.1