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

[tseaver@digicool.com]

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

Modified Files:
	PortalContent.py 
Log Message:


 - Fix buglet resulting from uninitialized local in 'objectItems'
   (thanks to Seb Bacon for the patch).




--- Updated File PortalContent.py in package CMF --
--- PortalContent.py	2001/06/01 18:43:33	1.16
+++ PortalContent.py	2001/06/04 02:58:33	1.17
@@ -250,11 +250,10 @@
         right now, I will return that. Should be replaced with
         a list of tuples for every opaque item!
         """
-        if hasattr( aq_base( self ), 'talkback' ):
-            talkback = self.talkback
+        talkback = getattr( aq_base( self ), 'talkback', None ):
         if talkback is not None:
             return ((talkback.id, talkback),)
         else:
-            return []
+            return ()
 
 InitializeClass(PortalContent)