diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
| commit | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (patch) | |
| tree | 32f197901b4b16ea7f94de682fee6cdc44686045 /app/views/stream_entries/_detailed_status.html.haml | |
| parent | fcf0d2078ea813e0dd318fa154d620018e7b7bcf (diff) | |
| parent | b9f59ebcc68e9da0a7158741a1a2ef3564e1321e (diff) | |
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
Diffstat (limited to 'app/views/stream_entries/_detailed_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 1d943a2ca..4c85fef8b 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -15,7 +15,7 @@ .status__content.p-name.emojify< - if status.spoiler_text? %p{ style: 'margin-bottom: 0' }< - %span.p-summary> #{status.spoiler_text} + %span.p-summary> #{Formatter.instance.format_spoiler(status)} %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }< = Formatter.instance.format(status) |