<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -21,7 +21,7 @@ xml.feed &quot;xmlns&quot; =&gt; &quot;http://www.w3.org/2005/Atom&quot; 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) &amp;&amp; !author.mail.blank?
+        xml.email(author.mail) if author.is_a?(User) &amp;&amp; !author.mail.blank? &amp;&amp; !author.pref.hide_mail
       end if author
       xml.content &quot;type&quot; =&gt; &quot;html&quot; do
         xml.text! textilizable(item.event_description, :only_path =&gt; false)</diff>
      <filename>app/views/common/feed.atom.rxml</filename>
    </modified>
    <modified>
      <diff>@@ -15,7 +15,7 @@ xml.feed &quot;xmlns&quot; =&gt; &quot;http://www.w3.org/2005/Atom&quot; 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) &amp;&amp; !change.user.mail.blank? &amp;&amp; !change.user.pref.hide_mail
       end
       xml.content &quot;type&quot; =&gt; &quot;html&quot; do
         xml.text! '&lt;ul&gt;'</diff>
      <filename>app/views/issues/changes.rxml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bd42b7cd9e69e85b3b983e6f51092b9374913520</id>
    </parent>
  </parents>
  <author>
    <name>Jean-Philippe Lang</name>
    <email>jp_lang@yahoo.fr</email>
  </author>
  <url>http://github.com/enderson/redmine/commit/9c630cc2b72336aed6fa0957b68f1cb598116bf4</url>
  <id>9c630cc2b72336aed6fa0957b68f1cb598116bf4</id>
  <committed-date>2009-05-25T11:11:32-07:00</committed-date>
  <authored-date>2009-05-25T11:11:32-07:00</authored-date>
  <message>Fixed: Atom feeds leak email address (#3408).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2763 e93f8b46-1217-0410-a6f0-8f06a7374b81</message>
  <tree>2f905a79deb262ef714d5bc138e0f4d783d1d046</tree>
  <committer>
    <name>Jean-Philippe Lang</name>
    <email>jp_lang@yahoo.fr</email>
  </committer>
</commit>
