From: Eugen Rochko Date: Tue, 9 Jan 2018 18:34:58 +0000 (+0100) Subject: Fix #6204: Use content warning for page title when present (#6231) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d41f0b66cc9768a0570c54194498a65a0ce0f31c;p=mastodon.git Fix #6204: Use content warning for page title when present (#6231) --- diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml index b52334a28..cf6671e67 100644 --- a/app/views/stream_entries/show.html.haml +++ b/app/views/stream_entries/show.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = t('statuses.title', name: display_name(@account), quote: truncate(@stream_entry.activity.text, length: 50, omission: '…')) + = t('statuses.title', name: display_name(@account), quote: truncate(@stream_entry.activity.spoiler_text.presence || @stream_entry.activity.text, length: 50, omission: '…')) - content_for :header_tags do - if @account.user&.setting_noindex