diff options
| author | R Tucker <github@ryantucker.us> | 2017-05-09 22:47:25 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-10 04:47:25 +0200 |
| commit | e2491680e696d2c285a798ec4c66b26d2748df66 (patch) | |
| tree | 1c5438c06d4917b7c2e49fa64dc5e8bbf696496b /app/views/stream_entries/_simple_status.html.haml | |
| parent | 3a38322a54f0eeb3eba037a4fd61a072bda44311 (diff) | |
Handle hashtags in spoiler_texts (partial fix for #699) (#2683)
* services: scan spoiler_text for hashtags (#699) * views: link hashtags from spoiler_texts This covers linking hashtags from within the spoiler text on the server-generated pages. * services: fix string concat going into hashtag RE Cleaner Ruby syntax, may handle immutable strings better
Diffstat (limited to 'app/views/stream_entries/_simple_status.html.haml')
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 3fa347f74..583bb24f3 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -16,7 +16,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.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) |