]> cat aescling's git repositories - mastodon.git/commitdiff
Fix remote profile being displayed in HTML on remote_follow (#5249)
authorunarist <m.unarist@gmail.com>
Fri, 6 Oct 2017 18:38:29 +0000 (03:38 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 6 Oct 2017 18:38:29 +0000 (20:38 +0200)
app/lib/formatter.rb

index d7f6ec47b584497db33d6aa5c0dfd094028145dc..57f105da7473937eeeb3f54131b5098b6a0735c0 100644 (file)
@@ -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)