Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: frozen string exception (#7505) 

Initial backtrace:

```
/var/www/discourse/app/mailers/user_notifications.rb:554:in `send_notification_email'
/var/www/discourse/app/mailers/user_notifications.rb:459:in `notification_email'
/var/www/discourse/app/mailers/user_notifications.rb:318:in `user_private_message'
```

* this might fail too
This commit is contained in:
Joffrey JAFFEUX 2019-05-08 16:52:38 +02:00 committed by GitHub
parent a4eb523af6
commit 2938e3f033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/mailers/user_notifications.rb
View File

@ -549,9 +549,9 @@ class UserNotifications < ActionMailer::Base
context_posts = context_posts.to_a context_posts = context_posts.to_a
if context_posts.present? if context_posts.present?
context << "-- \n*#{I18n.t('user_notifications.previous_discussion')}*\n" context += "-- \n*#{I18n.t('user_notifications.previous_discussion')}*\n"
context_posts.each do |cp| context_posts.each do |cp|
context << email_post_markdown(cp, true) context += email_post_markdown(cp, true)
end end
end end
@ -562,9 +562,9 @@ class UserNotifications < ActionMailer::Base
if opts[:use_invite_template] if opts[:use_invite_template]
invite_template = "user_notifications.invited" invite_template = "user_notifications.invited"
invite_template << "_group" if group_name invite_template += "_group" if group_name
invite_template << invite_template +=
if post.topic.private_message? if post.topic.private_message?
"_to_private_message_body" "_to_private_message_body"
else else