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

[rails.git] / app / views / user_mailer / diary_comment_notification.html.erb

diff --git a/app/views/user_mailer/diary_comment_notification.html.erb b/app/views/user_mailer/diary_comment_notification.html.erb
index b4efae83bd7aa15ed1cda0421fe68b85ff87e431..dab4510edb9467538558ce6dec62da05b1c7b4a6 100644 (file)
--- a/app/views/user_mailer/diary_comment_notification.html.erb
+++ b/app/views/user_mailer/diary_comment_notification.html.erb
@@ -11,8 +11,11 @@
 
 <% content_for :footer do %>
   <p><%= t ".footer_html",
 
 <% content_for :footer do %>
   <p><%= t ".footer_html",

-           :readurl => link_to(@readurl, @readurl) + tag(:br),
-           :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
+           :readurl => link_to(@readurl, @readurl) + tag.br,
+           :commenturl => link_to(@commenturl, @commenturl) + tag.br,

            :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
            :replyurl => link_to(@replyurl, @replyurl) %>
   </p>

+  <p><%= t ".footer_unsubscribe_html",
+           :unsubscribeurl => link_to(@unsubscribeurl, @unsubscribeurl) %>
+  </p>

 <% end %>
 <% end %>