diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:11:02 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-22 14:19:05 +0100 |
commit | 5c3881bfacdb34a605ddfbadf1531d0e341d7beb (patch) | |
tree | 088e752d1a6d2fb38d1409dbfb1cb332af92594c /app/models/request_mailer.rb | |
parent | 15a174375e638b91c138d771d4851613110f9cdc (diff) | |
parent | a29b3aaf0ae77af49d38813b62dddcb6889c1ebe (diff) |
merge from master and make tests pass
Diffstat (limited to 'app/models/request_mailer.rb')
-rw-r--r-- | app/models/request_mailer.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index e73b153b9..fc317d20d 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -205,10 +205,11 @@ class RequestMailer < ApplicationMailer def receive(email, raw_email) # Find which info requests the email is for reply_info_requests = self.requests_matching_email(email) - # Nothing found, so save in holding pen if reply_info_requests.size == 0 - InfoRequest.holding_pen_request.receive(email, raw_email) + reason = _("Could not identify the request from the email address") + request = InfoRequest.holding_pen_request + request.receive(email, raw_email, false, reason) return end |