[Zope-Checkins] CVS: Zope/lib/python/App - Common.py:1.9.2.1

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/App
In directory cvs.zope.org:/tmp/cvs-serv28944/lib/python/App

Modified Files:
      Tag: Zope-2_5-branch
	Common.py 
Log Message:
fixed broken manage_FTPlist on nested ZClasses 


=== Zope/lib/python/App/Common.py 1.9 => 1.9.2.1 ===
     if not hasattr(ob, 'aq_parent'):
         return 0
-    if hasattr(aq_base(ob.aq_parent), absattr(ob.id)):
+
+    parent = aq_base(ob.aq_parent)
+    absId  = absattr(ob.id)
+    
+    if hasattr(parent,'_objects'):
+        if absId+' ' in parent.objectIds():
+            return 0
+
+    if hasattr(parent, absId):
         return 0
     if hasattr(aq_base(ob), 'isTopLevelPrincipiaApplicationObject') and \
             ob.isTopLevelPrincipiaApplicationObject: