IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: error when group_in_subject enabled but no group in pm

Browse Source
This commit is contained in:
Leo McArdle
2018-03-11 12:22:11 +00:00
parent 3a35f459c7
commit 89f41f8236
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/mailers/user_notifications.rb
View File

@@ -435,13 +435,11 @@ class UserNotifications < ActionMailer::Base
if post.topic.private_message?
subject_pm =
if opts[:show_group_in_subject]
if group = post.topic.allowed_groups&.first
if group.full_name
"[#{group.full_name}] "
else
"[#{group.name}] "
end
if opts[:show_group_in_subject] and group = post.topic.allowed_groups&.first
if group.full_name
"[#{group.full_name}] "
else
"[#{group.name}] "
end
else
I18n.t('subject_pm')