about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-10-07 03:38:29 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-10-06 20:38:29 +0200
commitd8b2f89d33580045aa3115a86b2a9709760e595a (patch)
tree8e458c95a05fea97807e55b53d9b0480a8576285 /app
parentd5f490b1a2c77a755ae4bd2e73a15a7567eda4c1 (diff)
Fix remote profile being displayed in HTML on remote_follow (#5249)
Diffstat (limited to 'app')
-rw-r--r--app/lib/formatter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index d7f6ec47b..57f105da7 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -50,7 +50,7 @@ class Formatter
   end
 
   def simplified_format(account)
-    return reformat(account.note) unless account.local?
+    return reformat(account.note).html_safe unless account.local? # rubocop:disable Rails/OutputSafety
 
     html = encode_and_link_urls(account.note)
     html = simple_format(html, {}, sanitize: false)