diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-05-25 18:11:32 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-05-25 18:11:32 +0000 |
| commit | 9c630cc2b72336aed6fa0957b68f1cb598116bf4 (patch) | |
| tree | 2f905a79deb262ef714d5bc138e0f4d783d1d046 | |
| parent | bd42b7cd9e69e85b3b983e6f51092b9374913520 (diff) | |
| download | redmine-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
| -rw-r--r-- | app/views/common/feed.atom.rxml | 2 | ||||
| -rw-r--r-- | app/views/issues/changes.rxml | 2 |
2 files changed, 2 insertions, 2 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) diff --git a/app/views/issues/changes.rxml b/app/views/issues/changes.rxml index 239d2d6a3..43324cfb8 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>' |