##// END OF EJS Templates
Merged r2763 from trunk....
Jean-Philippe Lang -
r2665:50c0cebe96b4
parent child
Show More
@@ -21,7 +21,7 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
21 author = item.event_author if item.respond_to?(:event_author)
21 author = item.event_author if item.respond_to?(:event_author)
22 xml.author do
22 xml.author do
23 xml.name(author)
23 xml.name(author)
24 xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
24 xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
25 end if author
25 end if author
26 xml.content "type" => "html" do
26 xml.content "type" => "html" do
27 xml.text! textilizable(item.event_description)
27 xml.text! textilizable(item.event_description)
@@ -15,7 +15,7 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
15 xml.updated change.created_on.xmlschema
15 xml.updated change.created_on.xmlschema
16 xml.author do
16 xml.author do
17 xml.name change.user.name
17 xml.name change.user.name
18 xml.email(change.user.mail)
18 xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
19 end
19 end
20 xml.content "type" => "html" do
20 xml.content "type" => "html" do
21 xml.text! '<ul>'
21 xml.text! '<ul>'
@@ -5,6 +5,11 Copyright (C) 2006-2009 Jean-Philippe Lang
5 http://www.redmine.org/
5 http://www.redmine.org/
6
6
7
7
8 == 2009-xx-xx v0.8.5
9
10 * Fixed: Atom feeds leak email address
11
12
8 == 2009-05-17 v0.8.4
13 == 2009-05-17 v0.8.4
9
14
10 * Allow textile mailto links
15 * Allow textile mailto links
General Comments 0
You need to be logged in to leave comments. Login now