From 2938e3f03394a5b7c23efb44ade88d360c7a7f7b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 May 2019 16:52:38 +0200
Subject: [PATCH] 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
---
app/mailers/user_notifications.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 53392ccd757..7cf10127925 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -549,9 +549,9 @@ class UserNotifications < ActionMailer::Base
context_posts = context_posts.to_a
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 << email_post_markdown(cp, true)
+ context += email_post_markdown(cp, true)
end
end
@@ -562,9 +562,9 @@ class UserNotifications < ActionMailer::Base
if opts[:use_invite_template]
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?
"_to_private_message_body"
else