merging master into html-mail-fixes

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

diff --git a/app/views/notifier/note_comment_notification.html.erb b/app/views/notifier/note_comment_notification.html.erb
index 7492985317db950619621a3fa94c9c1a6c83e29e..909bffaa664c087873694dae8b8356d1a073d8d8 100644 (file)
--- a/app/views/notifier/note_comment_notification.html.erb
+++ b/app/views/notifier/note_comment_notification.html.erb
@@ -6,8 +6,10 @@
   <p><%= raw t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %></p>
 <% end %>
 
   <p><%= raw t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %></p>
 <% end %>
 

-<%= render "notifier/user_message_table", :captured => capture { %>
-  <%= @comment.to_html %>
-<% } %>
+<% unless @comment.empty? %>
+  <%= message_body do %>
+    <%= @comment.to_html %>
+  <% end %>
+<% end %>

 
 <p><%= raw t 'notifier.note_comment_notification.details', :url => link_to(@noteurl, @noteurl) %></p>
 
 <p><%= raw t 'notifier.note_comment_notification.details', :url => link_to(@noteurl, @noteurl) %></p>