From 93abdcf487eb51106955816a5c4025afabed8ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Sch=C3=A4fer?= <felix@fachschaften.org>
Date: Sat, 19 May 2012 00:00:16 +0200
Subject: [PATCH] Fix comments missing in wiki add/update mails #986

---
 app/views/mailer/wiki_content_added.text.html.rhtml    | 2 +-
 app/views/mailer/wiki_content_added.text.plain.rhtml   | 2 +-
 app/views/mailer/wiki_content_updated.text.html.rhtml  | 2 +-
 app/views/mailer/wiki_content_updated.text.plain.rhtml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/mailer/wiki_content_added.text.html.rhtml b/app/views/mailer/wiki_content_added.text.html.rhtml
index c4cbe5e3..41721527 100644
--- a/app/views/mailer/wiki_content_added.text.html.rhtml
+++ b/app/views/mailer/wiki_content_added.text.html.rhtml
@@ -1,3 +1,3 @@
 <p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
 		  																  :author => h(@wiki_content.author)) %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%=h @wiki_content.last_journal.notes %></em></p>
diff --git a/app/views/mailer/wiki_content_added.text.plain.rhtml b/app/views/mailer/wiki_content_added.text.plain.rhtml
index cbde7ec0..ac97033e 100644
--- a/app/views/mailer/wiki_content_added.text.plain.rhtml
+++ b/app/views/mailer/wiki_content_added.text.plain.rhtml
@@ -1,5 +1,5 @@
 <%= l(:mail_body_wiki_content_added, :id => h(@wiki_content.page.pretty_title),
 																		 :author => h(@wiki_content.author)) %>
-<%= @wiki_content.comments %>
+<%= @wiki_content.last_journal.notes %>
 
 <%= @wiki_content_url %>
diff --git a/app/views/mailer/wiki_content_updated.text.html.rhtml b/app/views/mailer/wiki_content_updated.text.html.rhtml
index d62d33e1..6e1bb49b 100644
--- a/app/views/mailer/wiki_content_updated.text.html.rhtml
+++ b/app/views/mailer/wiki_content_updated.text.html.rhtml
@@ -1,6 +1,6 @@
 <p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
   	    														      :author => h(@wiki_content.author)) %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%=h @wiki_content.last_journal.notes %></em></p>
 
 <p><%= l(:label_view_diff) %>:<br />
 <%= link_to h(@wiki_diff_url), @wiki_diff_url %></p>
diff --git a/app/views/mailer/wiki_content_updated.text.plain.rhtml b/app/views/mailer/wiki_content_updated.text.plain.rhtml
index 04839eaf..dbbbd5e2 100644
--- a/app/views/mailer/wiki_content_updated.text.plain.rhtml
+++ b/app/views/mailer/wiki_content_updated.text.plain.rhtml
@@ -1,6 +1,6 @@
 <%= l(:mail_body_wiki_content_updated, :id => h(@wiki_content.page.pretty_title),
 																			 :author => h(@wiki_content.author)) %>
-<%= @wiki_content.comments %>
+<%= @wiki_content.last_journal.notes %>
 
 <%= @wiki_content.page.pretty_title %>:
 <%= @wiki_content_url %>