From: unarist <m.unarist@gmail.com>
Date: Fri, 6 Oct 2017 18:38:29 +0000 (+0900)
Subject: Fix remote profile being displayed in HTML on remote_follow (#5249)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d8b2f89d33580045aa3115a86b2a9709760e595a;p=mastodon.git

Fix remote profile being displayed in HTML on remote_follow (#5249)
---

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)