Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: issues with 'X-MSYS-API' custom header

This commit is contained in:
Régis Hanol 2016-11-03 02:26:12 +01:00
parent 847eea85a0
commit 17169b3037
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/email/sender.rb
View File

@ -203,11 +203,16 @@ module Email
end end
def merge_json_x_header(name, value) def merge_json_x_header(name, value)
mc_metadata = JSON.parse(@message.header[name].to_s) rescue nil data = JSON.parse(@message.header[name].to_s) rescue nil
mc_metadata ||= {} data ||= {}
mc_metadata.merge!(value) data.merge!(value)
# /!\ @message.header is not a standard ruby hash.
# It can have multiple values attached to the same key...
# In order to remove all the previous keys, we have to "nil" it.
# But for "nil" to work, there must already be a key...
@message.header[name] = ""
@message.header[name] = nil @message.header[name] = nil
@message.header[name] = mc_metadata.to_json @message.header[name] = data.to_json
end end
end end