about summary refs log tree commit diff
path: root/app/helpers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-06 11:48:51 +0200
committerGitHub <noreply@github.com>2018-05-06 11:48:51 +0200
commit61a90186070395e133ad2f8e959bdf003a8615ca (patch)
tree49596898f7e5c72116db1d181847f5925a033c59 /app/helpers
parentbd10a7e48076c913a652c347b0477496be8813fa (diff)
Enable custom emojis in profiles (notes, field values, display names) (#7374)
Follow-up to #6124
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/stream_entries_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index c6f12ecd4..707c8e26c 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -4,8 +4,8 @@ module StreamEntriesHelper
   EMBEDDED_CONTROLLER = 'statuses'
   EMBEDDED_ACTION = 'embed'
 
-  def display_name(account)
-    account.display_name.presence || account.username
+  def display_name(account, **options)
+    Formatter.instance.format_display_name(account, options)
   end
 
   def account_description(account)