diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-06 11:48:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 11:48:51 +0200 |
| commit | 61a90186070395e133ad2f8e959bdf003a8615ca (patch) | |
| tree | 49596898f7e5c72116db1d181847f5925a033c59 /app/views/about | |
| parent | bd10a7e48076c913a652c347b0477496be8813fa (diff) | |
Enable custom emojis in profiles (notes, field values, display names) (#7374)
Follow-up to #6124
Diffstat (limited to 'app/views/about')
| -rw-r--r-- | app/views/about/_administration.html.haml | 2 | ||||
| -rw-r--r-- | app/views/about/_contact.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/about/_administration.html.haml b/app/views/about/_administration.html.haml index ec5834f9c..02286d68b 100644 --- a/app/views/about/_administration.html.haml +++ b/app/views/about/_administration.html.haml @@ -6,7 +6,7 @@ .account__avatar{ style: "background-image: url(#{@instance_presenter.contact_account.avatar.url})" } %span.display-name %bdi - %strong.display-name__html.emojify= display_name(@instance_presenter.contact_account) + %strong.display-name__html.emojify= display_name(@instance_presenter.contact_account, custom_emojify: true) %span.display-name__account @#{@instance_presenter.contact_account.acct} - else .account__display-name diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml index cf21ad5a3..3215d50b5 100644 --- a/app/views/about/_contact.html.haml +++ b/app/views/about/_contact.html.haml @@ -12,7 +12,7 @@ .avatar= image_tag contact.contact_account.avatar.url .name = link_to TagManager.instance.url_for(contact.contact_account) do - %span.display_name.emojify= display_name(contact.contact_account) + %span.display_name.emojify= display_name(contact.contact_account, custom_emojify: true) %span.username @#{contact.contact_account.acct} - else .owner |