about summary refs log tree commit diff
path: root/app/lib/formatter.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-09-09 14:15:52 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-09-09 14:15:52 +0200
commitec2a439a22bc74d21a99beedde4c0ae25f682d05 (patch)
treef1a0d06f465c7f5579a7496749457dfd65d46efc /app/lib/formatter.rb
parent7b1b968b73212d2ea4f7820b9b5b70d172d9d8e6 (diff)
Add account bio to account admin view (#11473)
* Add account bio to account admin view

* Change styling to make bio fields / content more readable
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r--app/lib/formatter.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index b5f42305f..990b9f63e 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -84,8 +84,7 @@ class Formatter
   end
 
   def format_field(account, str, **options)
-    return reformat(str).html_safe unless account.local? # rubocop:disable Rails/OutputSafety
-    html = encode_and_link_urls(str, me: true)
+    html = account.local? ? encode_and_link_urls(str, me: true) : reformat(str)
     html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
     html.html_safe # rubocop:disable Rails/OutputSafety
   end