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

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv27519

Modified Files:
	DiscussionTool.py 
Log Message:
Revert previous checkin, apparently we want to acquire.


=== CMF/CMFDefault/DiscussionTool.py 1.8 => 1.9 ===
 
 from Globals import InitializeClass, DTMLFile
-from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
 from OFS.SimpleItem import SimpleItem
 
@@ -100,12 +99,11 @@
         """
         if not self.isDiscussionAllowedFor( content ):
             raise DiscussionNotAllowed
-
-        if hasattr(aq_base(self), 'talkback'):
-            talkback = self.talkback
-        else:
+            
+        talkback = getattr( content, 'talkback', None )
+        if not talkback:
             talkback = self._createDiscussionFor( content )
-
+        
         return talkback
 
     security.declarePublic( 'isDiscussionAllowedFor' )