IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Force the right encoding when handling email.

Browse Source
This commit is contained in:
Guo Xiang Tan 2017-04-27 16:49:21 +08:00
parent 7873a2efb7
commit e4b9f72f9e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/admin/email_controller.rb
View File

@ -84,7 +84,20 @@ class Admin::EmailController < Admin::AdminController
def handle_mail
params.require(:email)
Jobs.enqueue(:process_email, mail: params[:email], retry_on_rate_limit: true)
retry_count = 0
begin
Jobs.enqueue(:process_email, mail: params[:email], retry_on_rate_limit: true)
rescue JSON::GeneratorError => e
if retry_count == 0
params[:email] = params[:email].force_encoding('iso-8859-1').encode("UTF-8")
retry_count += 1
retry
else
raise e
end
end
render plain: "email has been received and is queued for processing"
end