Merge remote-tracking branch 'upstream/pull/5387'

[rails.git] / app / helpers / user_mailer_helper.rb

diff --git a/app/helpers/user_mailer_helper.rb b/app/helpers/user_mailer_helper.rb
index 39977f5a7339a524ef95b81376e08ba98857d3dd..be756c212b943964caa0202b3b47e0347b3f8f7a 100644 (file)
--- a/app/helpers/user_mailer_helper.rb
+++ b/app/helpers/user_mailer_helper.rb
@@ -18,10 +18,10 @@ module UserMailerHelper
     )
   end
 
     )
   end
 

-  def message_body(&block)
+  def message_body(&)

     render(
       :partial => "message_body",
     render(
       :partial => "message_body",

-      :locals => { :body => capture(&block) }
+      :locals => { :body => capture(&) }

     )
   end
 
     )
   end
 


@@ -29,7 +29,7 @@ module UserMailerHelper
     # Because we can't use stylesheets in HTML emails, we need to inline the
     # styles. Rather than copy-paste the same string of CSS into every message,
     # we apply it once here, after the message has been composed.
     # Because we can't use stylesheets in HTML emails, we need to inline the
     # styles. Rather than copy-paste the same string of CSS into every message,
     # we apply it once here, after the message has been composed.

-    html.gsub(/<p>/, '<p style="color: black; margin: 0.75em 0; font-family: \'Helvetica Neue\', Arial, Sans-Serif">')
+    html.gsub("<p>", '<p style="color: black; margin: 0.75em 0; font-family: \'Helvetica Neue\', Arial, Sans-Serif">').html_safe

   end
 
   def style_left
   end
 
   def style_left