diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-15 17:04:06 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-15 17:04:06 +1100 |
| commit | e6c80e93df44a436d9c94a9c076eb321df249b2a (patch) | |
| tree | f2396181cfadeca370446f936f0bc4c1da3888dd /app/controllers/admin_request_controller.rb | |
| parent | b5f2bed1e406cd7fb6b50259a57be201c797db7d (diff) | |
| parent | 843805e5d92eded943bd2a32b02ac967539245e8 (diff) | |
Merge remote-tracking branch 'mysociety/develop' into rails_xss
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 |