From a762327fbc098f7c289fbb1bd69b913983f916a0 Mon Sep 17 00:00:00 2001 From: Sandor Semsey Date: Wed, 14 Jun 2023 14:36:27 +0200 Subject: [PATCH] remove deprecated isLegacy check --- ext/flexmailer/src/Listener/OpenTracker.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ext/flexmailer/src/Listener/OpenTracker.php b/ext/flexmailer/src/Listener/OpenTracker.php index 1e0dc84609..00b5e0224f 100644 --- a/ext/flexmailer/src/Listener/OpenTracker.php +++ b/ext/flexmailer/src/Listener/OpenTracker.php @@ -24,20 +24,12 @@ class OpenTracker extends BaseListener { return; } - $config = \CRM_Core_Config::singleton(); - - // TODO: After v5.21 goes EOL, remove the $isLegacy check. - $isLegacy = version_compare(\CRM_Utils_System::version(), '5.23.alpha', '<'); - foreach ($e->getTasks() as $task) { /** @var \Civi\FlexMailer\FlexMailerTask $task */ $mailParams = $task->getMailParams(); if (!empty($mailParams) && !empty($mailParams['html'])) { - $openUrl = $isLegacy - ? $config->userFrameworkResourceURL . "extern/open.php?q=" . $task->getEventQueueId() - : \CRM_Utils_System::externUrl('extern/open', "q=" . $task->getEventQueueId()); - + $openUrl = \CRM_Utils_System::externUrl('extern/open', 'q='. $task->getEventQueueId()); $mailParams['html'] .= "\n" . '"; $task->setMailParams($mailParams); -- 2.25.1