Fix order of htmldecode/encode calls

src/ClickTracker/BaseClickTracker.php

@@ -40,7 +40,7 @@ public static function getTrackerURLForUrlWithTokens($url, $mailing_id, $queue_i
 
     $trackable_url = $parsed[1];
 
-    // Proces the query parameters, if there are any.
+    // Process the query parameters, if there are any.
     $tokenised_params = [];
     $static_params = [];
     if (!empty($parsed[2])) {

src/ClickTracker/HtmlClickTracker.php

@@ -19,7 +19,12 @@ public function filterContent($msg, $mailing_id, $queue_id) {
     return self::replaceHrefUrls($msg,
       function ($url) use ($mailing_id, $queue_id, $getTrackerURL) {
         if (strpos($url, '{') !== FALSE) {
-          $data = BaseClickTracker::getTrackerURLForUrlWithTokens($url, $mailing_id, $queue_id);
+          // If there are tokens in the URL use special treatment.
+
+          // Since we're dealing with HTML let's strip out the entities in the URL
+          // so that we can add them back in later.
+          $originalUrlDecoded = html_entity_decode($url);
+          $data = BaseClickTracker::getTrackerURLForUrlWithTokens($originalUrlDecoded, $mailing_id, $queue_id);
         }
         else {
           $data = $getTrackerURL($url, $mailing_id, $queue_id);
@@ -42,9 +47,7 @@ function ($url) use ($mailing_id, $queue_id, $getTrackerURL) {
   public static function replaceHrefUrls($html, $replace) {
     $useNoFollow = TRUE;
     $callback = function ($matches) use ($replace, $useNoFollow) {
-      // Since we're dealing with HTML let's strip out the entities in the URL
-      // so tht we can add them back in later.
-      $replacement = $replace(html_entity_decode($matches[2]));
+      $replacement = $replace($matches[2]);
 
       // See: https://github.com/civicrm/civicrm-core/pull/12561
       // If we track click-throughs on a link, then don't encourage search-engines to traverse them.
@@ -65,7 +68,6 @@ public static function replaceHrefUrls($html, $replace) {
       ';(\<[^>]*href *= *\')([^\'>]+)(\');', $callback, $tmp);
   }
 
-
   //  /**
   //   * Find URL expressions; replace them with tracked URLs.
   //   *

src/ClickTracker/TextClickTracker.php

@@ -19,7 +19,7 @@ public function filterContent($msg, $mailing_id, $queue_id) {
     return self::replaceTextUrls($msg,
       function ($url) use ($mailing_id, $queue_id, $getTrackerURL) {
         if (strpos($url, '{') !== FALSE) {
-          $data = HtmlClickTracker::getTrackerURLForUrlWithTokens($url, $mailing_id, $queue_id);
+          $data = BaseClickTracker::getTrackerURLForUrlWithTokens($url, $mailing_id, $queue_id);
         }
         else {
           $data = $getTrackerURL($url, $mailing_id, $queue_id);