Fixed: Atom feeds leak email address (#3408).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2763 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: Atom feeds leak email address (#3408).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2763 e93f8b46-1217-0410-a6f0-8f06a7374b81
9c630cc2 · Jean-Philippe Lang · bd42b7cd · 9c630cc2 · 9c630cc2
Commit 9c630cc2 authored May 25, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

feed.atom.rxml app/views/common/feed.atom.rxml +1 -1

changes.rxml app/views/issues/changes.rxml +1 -1

No files found.
--- 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)

--- 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>'