Escape new lines for text->html conversions

caronc · Jul 1, 2022 · 79f0db3 · 79f0db3
1 parent 1519e98
commit 79f0db3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/apprise/URLBase.py b/apprise/URLBase.py
@@ -359,7 +359,7 @@ def escape_html(html, convert_new_lines=False, whitespace=True):
                 .replace(u' ', u'&nbsp;')
 
         if convert_new_lines:
-            return escaped.replace(u'\n', u'&lt;br/&gt;')
+            return escaped.replace(u'\n', u'<br/>')
 
         return escaped
 

diff --git a/apprise/conversion.py b/apprise/conversion.py
@@ -70,7 +70,8 @@ def text_to_html(content):
     Converts specified content from plain text to HTML.
     """
 
-    return URLBase.escape_html(content)
+    # First eliminate any carriage returns
+    return URLBase.escape_html(content, convert_new_lines=True)
 
 
 def html_to_text(content):

diff --git a/test/test_notify_base.py b/test/test_notify_base.py
@@ -183,7 +183,7 @@ def test_notify_base():
 
     assert NotifyBase.escape_html(
         "<content>'\t \n</content>", convert_new_lines=True) == \
-        '&lt;content&gt;&apos;&emsp;&nbsp;&lt;br/&gt;&lt;/content&gt;'
+        '&lt;content&gt;&apos;&emsp;&nbsp;<br/>&lt;/content&gt;'
 
     # Test invalid data
     assert NotifyBase.split_path(None) == []