From 3f390aa650e743f8ab7047814980fecaf1818202 Mon Sep 17 00:00:00 2001
From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Fri, 12 Feb 2016 23:09:31 -0500
Subject: [PATCH] CRM-18028: dont encode url when constructed

---
 CRM/Utils/Token.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
index cbb4f7adfc..57ffda4119 100644
--- a/CRM/Utils/Token.php
+++ b/CRM/Utils/Token.php
@@ -988,9 +988,8 @@ class CRM_Utils_Token {
     if (preg_match('/\{action\.subscribeUrl\}/', $str)) {
       $url = CRM_Utils_System::url('civicrm/mailing/subscribe',
         'reset=1',
-        TRUE, NULL, TRUE, TRUE
+        TRUE, NULL, FALSE, TRUE
       );
-      $url = str_replace('&amp;', '&', $url);
       $str = preg_replace('/\{action\.subscribeUrl\}/', $url, $str);
     }
 
@@ -999,9 +998,8 @@ class CRM_Utils_Token {
         $gid = substr($value, 21, -1);
         $url = CRM_Utils_System::url('civicrm/mailing/subscribe',
           "reset=1&gid={$gid}",
-          TRUE, NULL, TRUE, TRUE
+          TRUE, NULL, FALSE, TRUE
         );
-        $url = str_replace('&amp;', '&', $url);
         $str = preg_replace('/' . preg_quote($value) . '/', $url, $str);
       }
     }
-- 
2.25.1