From: Rachel H <rainyday@users.noreply.github.com>
Date: Mon, 10 Apr 2017 19:32:45 +0000 (-0700)
Subject: Keep newlines in xml (#1397)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f690320fb93ea1a884a292f9e099eb1bc0834b6d;p=mastodon.git

Keep newlines in xml (#1397)
---

diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index 52826ace0..e0cca6113 100644
--- a/app/assets/javascripts/components/components/status_content.jsx
+++ b/app/assets/javascripts/components/components/status_content.jsx
@@ -91,7 +91,7 @@ const StatusContent = React.createClass({
     const { status } = this.props;
     const { hidden } = this.state;
 
-    const content = { __html: emojify(status.get('content')) };
+    const content = { __html: emojify(status.get('content')).replace(/\n/g, '') };
     const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) };
     const directionStyle = { direction: 'ltr' };
 
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index da7ad2027..c3f331ff7 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -15,7 +15,6 @@ 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)