aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/info_request.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-06-07 22:04:53 +0100
committerRobin Houston <robin.houston@gmail.com>2012-06-07 22:04:53 +0100
commit1ff635e834c004600faa445fc53e757996cde30d (patch)
tree9854dff8f88afbb9b7738703b44523d25dbae069 /app/models/info_request.rb
parent428438732a90aab880dde72d22151105b46d9908 (diff)
WIP API
Diffstat (limited to 'app/models/info_request.rb')
-rw-r--r--app/models/info_request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 6cefc3dab..336d51cee 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -269,7 +269,7 @@ public
return self.magic_email("request-")
end
def incoming_name_and_email
- return TMail::Address.address_from_name_and_email(self.user.name, self.incoming_email).to_s
+ return TMail::Address.address_from_name_and_email(self.user_name, self.incoming_email).to_s
end
# Subject lines for emails about the request
@@ -490,7 +490,7 @@ public
self.save!
end
self.info_request_events.each { |event| event.xapian_mark_needs_index } # for the "waiting_classification" index
- RequestMailer.deliver_new_response(self, incoming_message)
+ RequestMailer.deliver_new_response(self, incoming_message) if !is_external?
end