From f1aaa0d7528ef9137bb4ce866f29fda9cd46009b Mon Sep 17 00:00:00 2001
From: maartenkling <maarten@fourdigits.nl>
Date: Thu, 1 Nov 2012 08:31:02 +0100
Subject: [PATCH 1/4] The border attribute is obsolete. Consider specifying img
 { border: 0; } in CSS instead.

---
 plone/app/discussion/browser/comments.pt                | 4 ++--
 plone/app/discussion/browser/stylesheets/discussion.css | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 8e28a88..c192e7a 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -44,14 +44,14 @@
                                tal:attributes="href author_home_url">
                          <img src="defaultUser.gif"
                               alt=""
-                              border="0"
+                              class="defaultuserimg"
                               height="32"
                               tal:attributes="src portrait_url;
                                               alt reply/author_name" />
                     </a>
                     <img src="defaultUser.gif"
                          alt=""
-                         border="0"
+                         class="defaultuserimg"
                          height="32"
                          tal:condition="not: has_author_link"
                          tal:attributes="src portrait_url;
diff --git a/plone/app/discussion/browser/stylesheets/discussion.css b/plone/app/discussion/browser/stylesheets/discussion.css
index e777222..a8ca7a5 100644
--- a/plone/app/discussion/browser/stylesheets/discussion.css
+++ b/plone/app/discussion/browser/stylesheets/discussion.css
@@ -108,6 +108,9 @@
 .replyTreeLevel10 {
     margin-left: 10em;
 }
+.defaultuserimg {
+    border: 0;
+}
 
 
 /* Reply Form

From 1c25c5c10adcbf2c004b398cf081d07ea80fa47e Mon Sep 17 00:00:00 2001
From: maartenkling <maarten@fourdigits.nl>
Date: Tue, 13 Nov 2012 09:40:32 +0100
Subject: [PATCH 2/4] add permissions to type, fixes #11497

---
 plone/app/discussion/comment.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py
index b16101e..a14eec8 100644
--- a/plone/app/discussion/comment.py
+++ b/plone/app/discussion/comment.py
@@ -41,6 +41,8 @@ from Products.CMFCore.CMFCatalogAware import CatalogAware
 from Products.CMFCore.CMFCatalogAware import WorkflowAware
 
 from OFS.role import RoleManager
+from AccessControl import ClassSecurityInfo
+from Products.CMFCore import permissions
 
 
 COMMENT_TITLE = _(
@@ -186,6 +188,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
         """
         return self.creator
 
+    security.declareProtected(permissions.View, 'Type')
     def Type(self):
         """The Discussion Item content type.
         """

From 33e7c1ef3937ec8459713a9655b8275fbbfca797 Mon Sep 17 00:00:00 2001
From: maartenkling <maarten@fourdigits.nl>
Date: Tue, 13 Nov 2012 09:41:57 +0100
Subject: [PATCH 3/4] update changes

---
 CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 69ffb3c..e77e101 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,13 @@ Changelog
 2.2.1 (unreleased)
 ------------------
 
+- fix insufficient privileges when trying to view
+  the RSS feed of a comment collection
+  [maartenkling]
+
+- removed inline border=0 and move it to css
+  [maartenkling]
+
 - For migrations of comments without a valid old_status, apply the 'published'
   state.
   [thet]

From 3f82467828fc812e775c49af54f12d1f3374156e Mon Sep 17 00:00:00 2001
From: maartenkling <maarten@fourdigits.nl>
Date: Tue, 13 Nov 2012 09:45:17 +0100
Subject: [PATCH 4/4] add missing declaration

---
 plone/app/discussion/comment.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py
index a14eec8..93bab67 100644
--- a/plone/app/discussion/comment.py
+++ b/plone/app/discussion/comment.py
@@ -80,6 +80,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
     """
 
     implements(IComment)
+    security = ClassSecurityInfo()
 
     meta_type = portal_type = 'Discussion Item'
     # This needs to be kept in sync with types/Discussion_Item.xml title