doc/CHANGES.txt

@@ -22,11 +22,6 @@ Zope Changes
 
    - Collector #1233: port ZOPE_CONFIG patch from Zope 2.7 to Zope 2.8
 
-  after Zope 2.9.0
-
-      - Collector #2002: fixed broken 'ls -R' functionality (didn't
-        recurse properly subclasses of OFS.Folder)
-
   Zope 2.9.0 (2006/01/09)
 
     Bugs fixed

lib/python/OFS/ObjectManager.py

@@ -524,7 +524,7 @@ class ObjectManager(
             obj_ids.sort()
             for id in obj_ids:
                 o=self._getOb(id)
-                if hasattr(aq_base(o), 'isPrincipiaFolderish') and \
+                if hasattr(o, 'isPrincipiaFolderish') and \
                    o.isPrincipiaFolderish:
                     r.append(o)
         return r
@@ -641,7 +641,7 @@ class ObjectManager(
                 break
             ob=ob.aq_parent
 
-        files = list(self.objectItems())
+        files=self.objectItems()
 
         # recursive ride through all subfolders (ls -R) (ajung)
 
@@ -649,10 +649,15 @@ class ObjectManager(
 
             all_files = copy.copy(files)
             for f in files:
-                if hasattr(aq_base(f[1]), 'isPrincipiaFolderish') and f[1].isPrincipiaFolderish:
+                if f[1].meta_type == "Folder":
                     all_files.extend(findChildren(f[1]))
+                else:
+                    all_files.append(f)
+
             files = all_files
 
+        files = list(files)
+
         # Perform globbing on list of files (ajung)
 
         globbing = REQUEST.environ.get('GLOBBING','')
@@ -730,12 +735,12 @@ def findChildren(obj,dirname=''):
     find all children of an object (ajung)
     """
 
-    lst = []
-    for name, child in obj.objectItems():
-        if hasattr(aq_base(child), 'isPrincipiaFolderish') and child.isPrincipiaFolderish:
-            lst.extend(findChildren(child, dirname + obj.id + '/'))
+    lst =[]
+    for name,child in obj.objectItems():
+        if child.meta_type=="Folder":
+            lst.extend(findChildren(child,dirname+ obj.id + '/'))
         else:
-            lst.append((dirname + obj.id + "/" + name, child))
+            lst.append( (dirname + obj.id + "/" + name,child) )
 
     return lst