From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Sat, 13 Feb 2016 01:14:26 +0000 (-0500)
Subject: CRM-18028 fix subscribeUrl token construction
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e0b6443ad870f578a2425a667181db9aaa790916;p=civicrm-core.git

CRM-18028 fix subscribeUrl token construction
---

diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
index 8e28f658b7..cbb4f7adfc 100644
--- a/CRM/Utils/Token.php
+++ b/CRM/Utils/Token.php
@@ -990,6 +990,7 @@ class CRM_Utils_Token {
         'reset=1',
         TRUE, NULL, TRUE, TRUE
       );
+      $url = str_replace('&amp;', '&', $url);
       $str = preg_replace('/\{action\.subscribeUrl\}/', $url, $str);
     }