diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
| commit | c8a203e221a55a5653596f5a8e092bd3877df9c4 (patch) | |
| tree | 3de4ac1214eca2c12a357e5f338b0d3055e79721 /app/models/exim_log.rb | |
| parent | e6dc0f6606b26e13cb0cd16124fdb2aad3c1b5a6 (diff) | |
| parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) | |
Merge branch 'release/0.6.7'
Conflicts:
locale/cs/app.po
locale/ro_RO/app.po
Diffstat (limited to 'app/models/exim_log.rb')
| -rw-r--r-- | app/models/exim_log.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/exim_log.rb b/app/models/exim_log.rb index 82000efa1..abe198493 100644 --- a/app/models/exim_log.rb +++ b/app/models/exim_log.rb @@ -17,8 +17,6 @@ # # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ -# -# $Id: exim_log.rb,v 1.14 2009-09-17 21:10:05 francis Exp $ class EximLog < ActiveRecord::Base belongs_to :info_request @@ -63,7 +61,7 @@ class EximLog < ActiveRecord::Base order = 0 for line in f order = order + 1 - email_domain = MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost") + email_domain = Configuration::incoming_email_domain emails = line.scan(/request-[^\s]+@#{email_domain}/).sort.uniq for email in emails info_request = InfoRequest.find_by_incoming_email(email) |