[CMF-checkins] CVS: CMF - PortalContent.py:1.19

tseaver@digicool.com tseaver@digicool.com
Mon, 4 Jun 2001 15:16:04 -0400 (EDT)


Update of /cvs-repository/CMF/CMFCore
In directory korak.digicool.com:/tmp/cvs-serv5438/CMFCore

Modified Files:
	PortalContent.py 
Log Message:
 - Fix acquisition stripping in PortalContent.objectItems().


--- Updated File PortalContent.py in package CMF --
--- PortalContent.py	2001/06/04 03:23:27	1.18
+++ PortalContent.py	2001/06/04 19:16:04	1.19
@@ -250,7 +250,8 @@
         right now, I will return that. Should be replaced with
         a list of tuples for every opaque item!
         """
-        talkback = getattr( aq_base( self ), 'talkback', None )
+        talkback = ( hasattr( aq_base( self ), 'talkback' ) and
+                      self.talkback or None )
         if talkback is not None:
             return ((talkback.id, talkback),)
         else: