diff options
| -rw-r--r-- | app/models/info_request.rb | 4 | ||||
| -rw-r--r-- | app/models/request_mailer.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 0c88f2b87..5b2d64753 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -23,7 +23,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.191 2009-06-15 15:43:19 francis Exp $ +# $Id: info_request.rb,v 1.192 2009-06-15 16:25:14 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -307,7 +307,7 @@ public if !allow if self.handle_rejected_responses == 'bounce' - RequestMailer.deliver_stopped_responses(self, email) + RequestMailer.deliver_stopped_responses(self, email, raw_email_data) elsif self.handle_rejected_responses == 'holding_pen' InfoRequest.holding_pen_request.receive(email, raw_email_data) elsif self.handle_rejected_responses == 'blackhole' diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 7ed571b18..d6923eca4 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_mailer.rb,v 1.76 2009-06-15 16:01:49 francis Exp $ +# $Id: request_mailer.rb,v 1.77 2009-06-15 16:25:14 francis Exp $ class RequestMailer < ApplicationMailer @@ -91,12 +91,12 @@ class RequestMailer < ApplicationMailer end # Incoming message arrived for a request, but new responses have been stopped. - def stopped_responses(info_request, email) + def stopped_responses(info_request, email, raw_email_data) @from = contact_from_name_and_email headers 'Return-Path' => blackhole_email, 'Reply-To' => @from # we don't care about bounces, likely from spammers @recipients = email.from_addrs[0].to_s @subject = "Your response to an FOI request was not delivered" - attachment :content_type => 'message/rfc822', :body => email.to_s + attachment :content_type => 'message/rfc822', :body => raw_email_data @body = { :info_request => info_request, :contact_email => MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') |