aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/admin_request_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-11-20 16:14:22 +0000
committerLouise Crow <louise.crow@gmail.com>2012-11-20 16:14:22 +0000
commitfcb6cdd6342d0272a8e7f05d20a4b0d87da70de9 (patch)
tree48ea4a5a796c4e95d26e4d4f36170ac09d368637 /app/controllers/admin_request_controller.rb
parentb0d9551a83c4a101ac808f1c35f66dd138cbc0f1 (diff)
parent24c3ceb2315734ab6e43ae4f75673e251b98a96e (diff)
Merge remote-tracking branch 'origin/feature/isolate-mail-handling' into develop
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
-rw-r--r--app/controllers/admin_request_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 6b6a8525e..1de63be59 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -207,8 +207,7 @@ class AdminRequestController < AdminController
end
raw_email_data = incoming_message.raw_email.data
- mail = TMail::Mail.parse(raw_email_data)
- mail.base64_decode
+ mail = MailHandler.mail_from_raw_email(raw_email_data)
destination_request.receive(mail, raw_email_data, true)
incoming_message_id = incoming_message.id