summaryrefslogtreecommitdiffstats
path: root/app/views/common
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-05-25 18:11:32 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-05-25 18:11:32 +0000
commit9c630cc2b72336aed6fa0957b68f1cb598116bf4 (patch)
tree2f905a79deb262ef714d5bc138e0f4d783d1d046 /app/views/common
parentbd42b7cd9e69e85b3b983e6f51092b9374913520 (diff)
downloadredmine-9c630cc2b72336aed6fa0957b68f1cb598116bf4.tar.gz
redmine-9c630cc2b72336aed6fa0957b68f1cb598116bf4.zip
Fixed: Atom feeds leak email address (#3408).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2763 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
-rw-r--r--app/views/common/feed.atom.rxml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index d276928a5..688d1d27a 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, :only_path => false)