diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
| commit | f313bf3e97ddd83e7847ae00f5bdb488942c943c (patch) | |
| tree | 5035b4504d35a85cb0b2fcbc65ce57ed5d0de71d /app/views/admin | |
| parent | a4e1830b5f15118bf2532401005376a0c6e896e6 (diff) | |
| parent | 30658924a80434e6a2bceb61267b911ea8d37898 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index b252f3eac..1230294fe 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -21,11 +21,11 @@ - if field.verified? %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) } = fa_icon 'check' - = prerender_custom_emojis(html_aware_format(field.value, account.local?, with_rel_me: true, with_domains: true, multiline: false), account.emojis) + = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis) - if account.note.present? %div - .account__header__content.emojify= prerender_custom_emojis(html_aware_format(account.note, account.local?), account.emojis) + .account__header__content.emojify= prerender_custom_emojis(account_bio_format(account), account.emojis) .dashboard__counters.admin-account-counters %div diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index b12a934a1..e5ea56779 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -23,7 +23,7 @@ = fa_icon('lock') if @report.target_account.locked? - if @report.target_account.note.present? .account-card__bio.emojify - = prerender_custom_emojis(html_aware_format(@report.target_account.note, @report.target_account.local?), @report.target_account.emojis) + = prerender_custom_emojis(account_bio_format(@report.target_account), @report.target_account.emojis) .account-card__actions .account-card__counters .account-card__counters__item |