From 5055dbe87d097df9dd319afb007d108f53e86092 Mon Sep 17 00:00:00 2001
From: larssandergreen <lars@wildsight.ca>
Date: Wed, 6 Sep 2023 21:23:11 -0600
Subject: [PATCH] rtrim when converting text tokens to html to avoid trailing
 newlines

---
 Civi/Token/TokenRow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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