CRM-20206 Use existing function to replace ampersand codes

monishdeb · Mar 2, 2017 · 23c625f · 23c625f
1 parent 58fb735
commit 23c625f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
@@ -1488,8 +1488,9 @@ private function getTokenData(&$token_a, $html = FALSE, &$contact, &$verp, &$url
         $url .= '"';
       }
       $data = $url;
+      // CRM-20206 Fix ampersand encoding in plain text emails
       if (empty($html)) {
-        $data = str_replace('&amp;', '&', $data);
+        $data = CRM_Utils_String::unstupifyUrl($data);
       }
     }
     elseif ($type == 'url') {