Fix #1609, fix #1628 - Revert #1397 (#1700)

When transmitting data in a HTML-encoded element like <content type="html" />, relying on newlines being preserved is not wise, since HTML by itself does not care for newlines - it cares for <p> and <br> Additional fix: reset NSFW toggle after sending toot
2017-04-13 19:23:36 +02:00
parent 9e5c1c487e
commit 043862f411
3 changed files with 3 additions and 1 deletions
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@ -15,6 +15,7 @@ class Formatter
    html = status.text
    html = encode(html)
    html = simple_format(html, {}, sanitize: false)
+    html = html.gsub(/\n/, '')
    html = link_urls(html)
    html = link_mentions(html, status.mentions)
    html = link_hashtags(html)