Simplify tracking of URLs

[civicrm-core.git] / ext / flexmailer / src / ClickTracker / HtmlClickTracker.php

diff --git a/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php b/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php
index a511f90e06bebd8c8612ae60724ed1b4212bbbc9..5e8955d5168b3c5a324f0976404cb41347313b21 100644 (file)
--- a/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php
+++ b/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php
@@ -15,11 +15,8 @@ class HtmlClickTracker implements ClickTrackerInterface {
   public function filterContent($msg, $mailing_id, $queue_id) {
     return self::replaceHrefUrls($msg,
       function ($url) use ($mailing_id, $queue_id) {
-        if (strpos($url, '{') !== FALSE) {
-          return $url;
-        }
         $data = \CRM_Mailing_BAO_TrackableURL::getTrackerURL(
-          $url, $mailing_id, $queue_id);
+          html_entity_decode($url), $mailing_id, $queue_id);
         $data = htmlentities($data, ENT_NOQUOTES);
         return $data;
       }