Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

don't pass notification email into to the default cause it freezes in a potentially incorrect value

Browse source
This commit is contained in:
Sam 2013-04-02 13:29:34 +11:00
parent 6ac8911a4e
commit 08af09cd7d
4 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/email_builder.rb
View file

@ -19,8 +19,7 @@ module EmailBuilder
subject: I18n.t("#{email_key}.subject_template", params),
body: body
}
mail_args[:from] = params[:from] if params[:from].present?
mail_args[:from] = params[:from] || SiteSetting.notification_email
mail(mail_args)
end