diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-01-07 09:53:18 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-01-07 09:53:18 +0000 |
| commit | b803759551cc036a5e043a2991f386d8bcd0a398 (patch) | |
| tree | 61c6c01bc21802d17f7bebb90c3def451cd8d889 /app/controllers/request_controller.rb | |
| parent | 76950510e850d7f09af9710d86bd94c815fd7759 (diff) | |
| parent | be4f5819bd4b18ef0e241ee846d6b42fc7a36cbe (diff) | |
Merge branch 'hotfix/0.20.0.2' into rails-3-develop
Diffstat (limited to 'app/controllers/request_controller.rb')
| -rw-r--r-- | app/controllers/request_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 413b74cea..39e7616ed 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -776,6 +776,9 @@ class RequestController < ApplicationController # Prevent spam to magic request address. Note that the binary # subsitution method used depends on the content type @incoming_message.apply_masks!(@attachment.body, @attachment.content_type) + if response.content_type == 'text/html' + @attachment.body = ActionController::Base.helpers.sanitize(@attachment.body) + end render :text => @attachment.body end |