[CMF-checkins] CVS: Products/CMFDefault - DiscussionTool.py:1.21.2.1

[Stefan H. Holek]

Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv25712/CMFDefault

Modified Files:
      Tag: CMF-1_5-branch
	DiscussionTool.py 
Log Message:
Make sure getDiscussionFor returns acquisition-wrapped talkback objects.


=== Products/CMFDefault/DiscussionTool.py 1.21 => 1.21.2.1 ===
--- Products/CMFDefault/DiscussionTool.py:1.21	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/DiscussionTool.py	Mon Jan 17 19:45:27 2005
@@ -106,10 +106,10 @@
             talkback = getattr(content, 'talkback')
         else:
             talkback = getattr( aq_base(content), 'talkback', None )
-            if not talkback:
+            if talkback is None:
                 talkback = self._createDiscussionFor( content )
 
-        return talkback
+        return content.talkback # Return wrapped talkback
 
     security.declarePublic( 'isDiscussionAllowedFor' )
     def isDiscussionAllowedFor( self, content ):