Convert new lines to page breaks when rendering text tokens to html

diff --git a/Civi/Token/TokenRow.php b/Civi/Token/TokenRow.php
index 0ef5b067e36a0dcf3e0b950a9fe28f1eb3705b05..0a6b653df891db9945ecd8d0b2b5360913b8cf84 100644 (file)
--- a/Civi/Token/TokenRow.php
+++ b/Civi/Token/TokenRow.php
@@ -280,7 +280,7 @@ class TokenRow {
                 $htmlTokens[$entity][$field] = \CRM_Utils_String::purifyHTML($value);
               }
               else {
-                $htmlTokens[$entity][$field] = is_object($value) ? $value : htmlentities($value, ENT_QUOTES);
+                $htmlTokens[$entity][$field] = is_object($value) ? $value : nl2br(htmlentities($value, ENT_QUOTES));
               }
             }
           }