Revert "Merge branch 'master' of https://github.com/discourse/discourse"

This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.

app/helpers/email_helper.rb

@@ -25,8 +25,12 @@ module EmailHelper
     raw "<a href='#{Discourse.base_url}#{url}' style='color: ##{@anchor_color}'>#{title}</a>"
   end
 
-  def email_html_template
-    EmailStyle.new.html.sub('%{email_content}', yield).html_safe
+  def email_html_template(binding_arg)
+    template = EmailStyle.new.html.sub(
+      '%{email_content}',
+      '<%= yield %><% if defined?(html_body) %><%= html_body %><% end %>'
+    )
+    ERB.new(template).result(binding_arg)
   end
 
   protected