Replace @body with @text again...

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 1223d54b1c00f48b0ffa4230f48e88b779e3bff2..343c3db2292fd9fd7625abe9b87889671e6d6f50 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -81,7 +81,7 @@ class Notifier < ActionMailer::Base
     @locale = comment.diary_entry.user.preferred_language_from(I18n.available_locales)
     @to_user = comment.diary_entry.user.display_name
     @from_user = comment.user.display_name
-    @body = comment.body
+    @text = comment.body
     @title = comment.diary_entry.title
     @readurl = url_for(:host => SERVER_URL,
                        :controller => "diary_entry",

diff --git a/app/views/notifier/diary_comment_notification.text.erb b/app/views/notifier/diary_comment_notification.text.erb
index efdd620e6f763e5c2d5f01a5521f906b63fa2f92..193e10de9727d3fe9e858e9a6349f1862638c22d 100644 (file)
--- a/app/views/notifier/diary_comment_notification.text.erb
+++ b/app/views/notifier/diary_comment_notification.text.erb
@@ -3,7 +3,7 @@
 <%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %>
 
 ==
-<%= @body %>
+<%= raw @text %>
 ==
 
 <%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>