From 50c0cebe96b4f0f16824e055b8fcfed0d53730b8 2009-05-25 18:14:15
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2009-05-25 18:14:15
Subject: [PATCH] Merged r2763 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2764 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 629ea4a..a24a33d 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -21,7 +21,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       author = item.event_author if item.respond_to?(:event_author)
       xml.author do
         xml.name(author)
-        xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
+        xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
       end if author
       xml.content "type" => "html" do
         xml.text! textilizable(item.event_description)
diff --git a/app/views/issues/changes.rxml b/app/views/issues/changes.rxml
index 239d2d6..43324cf 100644
--- a/app/views/issues/changes.rxml
+++ b/app/views/issues/changes.rxml
@@ -15,7 +15,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       xml.updated change.created_on.xmlschema
       xml.author do
         xml.name change.user.name
-        xml.email(change.user.mail)
+        xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
       end
       xml.content "type" => "html" do
         xml.text! '<ul>'
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 2a078ba..f9523fb 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,6 +5,11 @@ Copyright (C) 2006-2009  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2009-xx-xx v0.8.5
+
+* Fixed: Atom feeds leak email address
+
+
 == 2009-05-17 v0.8.4
 
 * Allow textile mailto links