From 36f294e1aec870bfb56af60c0e68fa476a99d8a4 Mon Sep 17 00:00:00 2001
From:  <brian@svn.zope.org>
Date: Mon, 31 Jul 2000 13:15:42 +0000
Subject: [PATCH] Merged aq-wrapping fix to preserve security in
 ZopeFindAndApply

---
 ZCatalog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ZCatalog.py b/ZCatalog.py
index 708ef197..06a7c259 100644
--- a/ZCatalog.py
+++ b/ZCatalog.py
@@ -526,7 +526,7 @@ def ZopeFindAndApply(self, obj, obj_ids=None, obj_metatypes=None,
 
         if not hasattr(base, 'objectItems'):
             return result
-        try:    items=base.objectItems()
+        try:    items=obj.objectItems()
         except: return result
 
         try: add_result=result.append