Merge branch 'master' into notes

[rails.git] / app / views / notifier / message_notification.html.erb

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index ef55b9b96af68e3def52d07a5f1026a2543e3853..0b2ff9e69480c2ddf54250a2177811f3ad37aa91 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -3,7 +3,7 @@
 <p><%= raw t'notifier.message_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p>
 
 ==
-<%= htmlize @text %>
+<%= @text.to_html %>
 ==
 
 <p>