From 649e41fcd5c84cc76b29416dbd5d64aa257c1194 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Fri, 22 Jan 2010 17:54:30 +0000
Subject: [PATCH] Undo r33270. Make IDiscussionLayer inherit from
 IDefaultPloneLayer for now, to fix the comment Viewlet in Plone 4.0a3. This
 can be removed again as soon as Plone 4.0b1 is out. Thanks davisagli!

svn path=/plone.app.discussion/trunk/; revision=33278
---
 plone/app/discussion/browser/configure.zcml        | 2 +-
 plone/app/discussion/interfaces.py                 | 8 ++++++--
 plone/app/discussion/profiles/default/viewlets.xml | 7 -------
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 plone/app/discussion/profiles/default/viewlets.xml

diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml
index 788bcf4..6fb20e4 100644
--- a/plone/app/discussion/browser/configure.zcml
+++ b/plone/app/discussion/browser/configure.zcml
@@ -55,7 +55,7 @@
 
     <!-- Comments viewlet -->
     <browser:viewlet
-        name="plone.app.discussion.comments"
+        name="plone.comments"
         for="Products.CMFCore.interfaces.IContentish"
         layer="..interfaces.IDiscussionLayer"
         manager="plone.app.layout.viewlets.interfaces.IBelowContent"
diff --git a/plone/app/discussion/interfaces.py b/plone/app/discussion/interfaces.py
index 772ad6c..2b02f19 100644
--- a/plone/app/discussion/interfaces.py
+++ b/plone/app/discussion/interfaces.py
@@ -198,6 +198,10 @@ class ICommentingTool(Interface):
         """Perform a search over all indexed comments.
         """
 
-class IDiscussionLayer(Interface):
+#class IDiscussionLayer(Interface):
+# XXX: This is only temporarily. IDefaultPloneLayer can be removed again as soon
+# as Plone 4.0b1 with plone.theme 2.0b1 is out. [davisagli]
+from plone.theme.interfaces import IDefaultPloneLayer
+class IDiscussionLayer(IDefaultPloneLayer):
     """Request marker installed via browserlayer.xml.
-    """
\ No newline at end of file
+    """
diff --git a/plone/app/discussion/profiles/default/viewlets.xml b/plone/app/discussion/profiles/default/viewlets.xml
deleted file mode 100644
index 19629de..0000000
--- a/plone/app/discussion/profiles/default/viewlets.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<object>
- <!-- hide standard plone comments viewlet -->
- <hidden manager="plone.belowcontent" skinname="Plone Default">
-  <viewlet name="plone.comments"/>
- </hidden>
-</object>
\ No newline at end of file