logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: d41f0b66cc9768a0570c54194498a65a0ce0f31c
parent: 921b78190912b3cd74cea62fc3e773c56e8f609e
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue,  9 Jan 2018 19:34:58 +0100

Fix #6204: Use content warning for page title when present (#6231)


Diffstat:

Mapp/views/stream_entries/show.html.haml2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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