projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
64a0d0b
)
CRM-18028 fix subscribeUrl token construction
author
Brian Shaughnessy
<brian@lcdservices.biz>
Sat, 13 Feb 2016 01:14:26 +0000
(20:14 -0500)
committer
Brian Shaughnessy
<brian@lcdservices.biz>
Sat, 13 Feb 2016 01:14:26 +0000
(20:14 -0500)
CRM/Utils/Token.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/Token.php
b/CRM/Utils/Token.php
index 8e28f658b7d9d9905f97eb06ccbc6294e21afb91..cbb4f7adfc239e4c854216c1ddc166a6dcf81eb0 100644
(file)
--- 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('&', '&', $url);
$str = preg_replace('/\{action\.subscribeUrl\}/', $url, $str);
}