diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-06 07:42:41 -0800 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-06 07:42:41 -0800 |
| commit | bda2645de69bfee361280c4bfe3dc1bef8aa330d (patch) | |
| tree | b206e9030b5d0f006ac897b05809193bc601ee94 | |
| parent | c48f20cf5a80333726aa3fb2bd992be99af09ce2 (diff) | |
| parent | e4395482a9b771b0712489f98d0c8ae25b631cd8 (diff) | |
Merge remote-tracking branch 'openaustralia_github/escaping_fix_email_subjects' into develop
| -rw-r--r-- | app/models/request_mailer.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 1b51b9479..215b28e77 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -106,7 +106,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = user.name_and_email - @subject = _("Delayed response to your FOI request - ") + info_request.title + @subject = (_("Delayed response to your FOI request - ") + info_request.title).html_safe @body = { :info_request => info_request, :url => url } end @@ -125,7 +125,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = user.name_and_email - @subject = _("You're long overdue a response to your FOI request - ") + info_request.title + @subject = (_("You're long overdue a response to your FOI request - ") + info_request.title).html_safe @body = { :info_request => info_request, :url => url } end @@ -177,7 +177,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email - @subject = _("Clarify your FOI request - ") + info_request.title + @subject = (_("Clarify your FOI request - ") + info_request.title).html_safe @body = { :incoming_message => incoming_message, :info_request => info_request, :url => url } end @@ -188,7 +188,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email - @subject = _("Somebody added a note to your FOI request - ") + info_request.title + @subject = (_("Somebody added a note to your FOI request - ") + info_request.title).html_safe @body = { :comment => comment, :info_request => info_request, :url => main_url(comment_url(comment)) } end def comment_on_alert_plural(info_request, count, earliest_unalerted_comment) @@ -197,7 +197,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email - @subject = _("Some notes have been added to your FOI request - ") + info_request.title + @subject = (_("Some notes have been added to your FOI request - ") + info_request.title).html_safe @body = { :count => count, :info_request => info_request, :url => main_url(comment_url(earliest_unalerted_comment)) } end |