diff options
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/application_mailer.rb | 4 | ||||
-rw-r--r-- | app/models/incoming_message.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index e504b88fc..9d61a16e6 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_mailer.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application_mailer.rb,v 1.3 2008-02-13 08:12:10 francis Exp $ +# $Id: application_mailer.rb,v 1.4 2008-02-19 12:13:07 francis Exp $ class ApplicationMailer < ActionMailer::Base # Include all the functions views get, as emails call similar things. @@ -13,7 +13,7 @@ class ApplicationMailer < ActionMailer::Base self.raise_delivery_errors = true def contact_from_name_and_email - "GovernmentSpy <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">" + "foi.mysociety.org <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">" end end diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index b4af65d77..8d1972a50 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -18,7 +18,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.41 2008-02-16 02:36:17 francis Exp $ +# $Id: incoming_message.rb,v 1.42 2008-02-19 12:13:07 francis Exp $ # TODO @@ -107,7 +107,7 @@ class IncomingMessage < ActiveRecord::Base end text = text.gsub(self.info_request.incoming_email, "[FOI #" + self.info_request.id.to_s + " email]") text = text.gsub(self.info_request.envelope_email, "[FOI #" + self.info_request.id.to_s + " bounce email]") - text = text.gsub(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[GovernmentSpy contact email]") + text = text.gsub(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[foi.mysociety.org contact email]") return text end |