From 043862f4118a9ee5e6708ff9c144fa9e668ee06d Mon Sep 17 00:00:00 2001
From: Eugen <eugen@zeonfederated.com>
Date: Thu, 13 Apr 2017 19:23:36 +0200
Subject: 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
---
 app/lib/formatter.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/lib')

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index b6d371ed2..64349e68e 100644
--- 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)
-- 
cgit