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

FIX: Don't sanitize `header_instructions`

This commit is contained in:
Robin Ward 2015-12-10 18:14:51 -05:00
parent 323e3cee22
commit df19a27753
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/email/message_builder.rb
View File

@ -69,19 +69,20 @@ module Email
header_instructions = @template_args[:header_instructions]
if header_instructions.present?
header_instructions = PrettyText.cook(header_instructions).html_safe
header_instructions = PrettyText.cook(header_instructions, sanitize: false).html_safe
html_override.gsub!("%{header_instructions}", header_instructions)
else
html_override.gsub!("%{header_instructions}", "")
end
if response_instructions = @template_args[:respond_instructions]
respond_instructions = PrettyText.cook(response_instructions).html_safe
respond_instructions = PrettyText.cook(response_instructions, sanitize: false).html_safe
html_override.gsub!("%{respond_instructions}", respond_instructions)
else
html_override.gsub!("%{respond_instructions}", "")
end
styled = Email::Styles.new(html_override, @opts)
styled.format_basic

2
lib/pretty_text.rb
View File

@ -187,7 +187,7 @@ module PrettyText
decorate_context(context)
context_opts = opts || {}
context_opts[:sanitize] ||= true
context_opts[:sanitize] = true unless context_opts[:sanitize] == false
context['opts'] = context_opts
context['raw'] = text