Merge pull request #1889 from plone/atom-show-about

Fix atom.xml feed not paying attention for setting to show about(5.0.x)
plone · Jan 3, 2017 · 5560479 · 5560479
2 parents d74a7c1 + 6e6587a
commit 5560479
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -68,12 +68,15 @@ Bug fixes:
 - Don't fail, if ``timestamp.txt`` was deleted from the resource registries production folder.
   [thet]
 
-- Fix security test assertion: 
+- Fix security test assertion:
   TestAttackVectorsFunctional test_widget_traversal_2 assumed a 302 http return code when accessing some private API.
-  Meanwhile it changed to return a 404 on the URL. 
+  Meanwhile it changed to return a 404 on the URL.
   Reflect this in the test and expect a 404.
   [jensens]
 
+- Fix atom.xml feed not paying attention for setting to show about information
+  [vangheem]
+
 
 5.0.6 (2016-09-23)
 ------------------

diff --git a/Products/CMFPlone/browser/syndication/templates/atom.xml.pt b/Products/CMFPlone/browser/syndication/templates/atom.xml.pt
@@ -57,7 +57,7 @@
       <author tal:define="creator item/creator;
                           author_name item/author_name;
                           author_email item/author_email"
-              tal:condition="python:creator or author_name">
+              tal:condition="python:feed.show_about and (creator or author_name)">
         <name tal:condition="author_name"
               tal:content="author_name" />
         <name tal:condition="python: not author_name"