summaryrefslogtreecommitdiffstats
path: root/app/views/common
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-02-16 16:20:35 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-02-16 16:20:35 +0000
commit153c4c242d7ade5f9c35fe75090bcb170c26ab96 (patch)
tree014bcff30c60e640775634a5889fdf66111147b7 /app/views/common
parent05823373724e472b6b7f9f172733aa16d132ced7 (diff)
downloadredmine-153c4c242d7ade5f9c35fe75090bcb170c26ab96.tar.gz
redmine-153c4c242d7ade5f9c35fe75090bcb170c26ab96.zip
Atom feeds:
* prevent duplicate entry ids for issue changes * prevent empty email in author element git-svn-id: http://redmine.rubyforge.org/svn/trunk@1154 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
-rw-r--r--app/views/common/feed.atom.rxml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 59b3163f4..6695565f4 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -15,8 +15,8 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.updated item.event_datetime.xmlschema
author = item.event_author if item.respond_to?(:author)
xml.author do
- xml.name(author.is_a?(User) ? author.name : author)
- xml.email(author.mail) if author.is_a?(User)
+ xml.name(author)
+ xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
end if author
xml.content "type" => "html" do
xml.text! textilizable(item.event_description)