diff options
| author | Rachel H <rainyday@users.noreply.github.com> | 2017-04-10 12:32:45 -0700 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-10 21:32:45 +0200 |
| commit | f690320fb93ea1a884a292f9e099eb1bc0834b6d (patch) | |
| tree | 11bb9046b8197e41fef99f29a1431ba26ab64f7c /app | |
| parent | 553170b77acea8867cb67deca7c24ce9e16c9c48 (diff) | |
Keep newlines in xml (#1397)
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 2 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 1 |
2 files changed, 1 insertions, 2 deletions
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) |