aboutsummaryrefslogtreecommitdiffstats
path: root/app/mailers
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-05-15 16:09:29 +0100
committerLouise Crow <louise.crow@gmail.com>2014-05-15 16:09:29 +0100
commit26348ce676f7ebbabcc535b2ecf00f99f8fe85c0 (patch)
tree6034dd656a0f9af152f24d6c491b5e61a7190a7d /app/mailers
parent851ef575cf3c55a3bb194381497b958c2a3ebf1a (diff)
parentb3fa23047bf96bd6a08273c9491ac1ee3b4a3f80 (diff)
Merge branch 'release/0.18' into wdtk
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/request_mailer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb
index af1a75df9..1fd5b9ba7 100644
--- a/app/mailers/request_mailer.rb
+++ b/app/mailers/request_mailer.rb
@@ -250,7 +250,7 @@ class RequestMailer < ApplicationMailer
if reply_info_requests.size == 0
reason = _("Could not identify the request from the email address")
request = InfoRequest.holding_pen_request
- request.receive(email, raw_email, false, reason)
+ request.receive(email, raw_email, false, reason) unless SpamAddress.spam?(email.to)
return
end