diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
commit | 5f3418307d6087f848eb1fdbf4531d67416121df (patch) | |
tree | cb7dad95b6b21db3b237efabc9d0fa37879adc10 /app/controllers/admin_request_controller.rb | |
parent | 07121bf22b0929e03215f02b8740c3979ae6c872 (diff) | |
parent | 7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff) |
Merge branch 'release/0.6.9' into wdtk
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
-rw-r--r-- | app/controllers/admin_request_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 1de63be59..c7c8d4972 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -277,7 +277,7 @@ class AdminRequestController < AdminController if params[:incoming_message_id] incoming_message = IncomingMessage.find(params[:incoming_message_id]) - email = incoming_message.from_address + email = incoming_message.from_email name = incoming_message.safe_mail_from || info_request.public_body.name else email = info_request.public_body.request_email |