From ba2c298315980861160e4a14a0b3cdfc07a0b26c Mon Sep 17 00:00:00 2001
From: Rohan Katkar <rohan.katkar@webaccessglobal.com>
Date: Fri, 5 Dec 2014 19:17:05 +0530
Subject: [PATCH] CRM-14988 URL encoding error

---
 CRM/Mailing/BAO/Mailing.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 5ab7cde0c1..f45ab99c4f 100644
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -1444,6 +1444,9 @@ ORDER BY   civicrm_email.is_bulkmail DESC
     elseif ($type == 'url') {
       if ($this->url_tracking) {
         $data = CRM_Mailing_BAO_TrackableURL::getTrackerURL($token, $this->id, $event_queue_id);
+        if (!empty($html)) {
+          $data = htmlentities($data);
+        }
       }
       else {
         $data = $token;
-- 
2.25.1