aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/info_request.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 09d9840bc..b2ee3582b 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -19,7 +19,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.38 2008-02-14 11:19:42 francis Exp $
+# $Id: info_request.rb,v 1.39 2008-02-14 12:21:59 francis Exp $
require 'digest/sha1'
@@ -61,7 +61,7 @@ public
return self.magic_email("request-")
end
def incoming_name_and_email
- return "GovernmentSpy <" + self.incoming_email + ">"
+ return self.user.name + " <" + self.incoming_email + ">"
end
# Modified version of incoming_email to use in the envelope from, for
@@ -70,7 +70,7 @@ public
return self.magic_email("request-bounce-")
end
def envelope_name_and_email
- return "GovernmentSpy <" + self.envelope_email + ">"
+ return self.user.name + " <" + self.envelope_email + ">"
end
# Return info request corresponding to an incoming email address, or nil if