From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 18 May 2018 13:56:57 +0000 (+0200)
Subject: Fix double-encoding of display name in title and e-mails (#7534)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9422b3e0d8a06044658cf15f8fffae43fabb5684;p=mastodon.git

Fix double-encoding of display name in title and e-mails (#7534)
---

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 707c8e26c..a91a28935 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -5,7 +5,11 @@ module StreamEntriesHelper
   EMBEDDED_ACTION = 'embed'
 
   def display_name(account, **options)
-    Formatter.instance.format_display_name(account, options)
+    if options[:custom_emojify]
+      Formatter.instance.format_display_name(account, options)
+    else
+      account.display_name.presence || account.username
+    end
   end
 
   def account_description(account)