Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FEATURE: new 'always_show_trimmed_content' site setting

Browse source
This commit is contained in:
Régis Hanol 2016-11-16 22:06:07 +01:00
parent a5de6f79a3
commit a69f45d0da
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/email/receiver.rb
View file

@ -557,7 +557,7 @@ module Email
options[:topic].try(:private_message?)
# only add elided part in messages
if options[:elided].present? && is_private_message
if options[:elided].present? && (SiteSetting.always_show_trimmed_content || is_private_message)
options[:raw] << "\n\n" << "<details class='elided'>" << "\n"
options[:raw] << "<summary title='#{I18n.t('emails.incoming.show_trimmed_content')}'>&#183;&#183;&#183;</summary>" << "\n"
options[:raw] << options[:elided] << "\n"