From e0b6443ad870f578a2425a667181db9aaa790916 Mon Sep 17 00:00:00 2001
From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Fri, 12 Feb 2016 20:14:26 -0500
Subject: [PATCH] CRM-18028 fix subscribeUrl token construction

---
 CRM/Utils/Token.php | 1 +
 1 file changed, 1 insertion(+)

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);
     }
 
-- 
2.25.1