Commit 8ddad1a7 authored by Andreas Jung's avatar Andreas Jung

- ZCatalog: refreshCatalog() could not be called safely from a ZEO

  client script
parent 36e3f3b5
...@@ -26,6 +26,9 @@ Zope Changes ...@@ -26,6 +26,9 @@ Zope Changes
Bugs Fixed Bugs Fixed
- ZCatalog: refreshCatalog() could not be called safely from a ZEO
client script
- Catalog.clear(): fixed handling of _length attribute (caused import - Catalog.clear(): fixed handling of _length attribute (caused import
problems for some .zexp files e.g. Squishdot instances) problems for some .zexp files e.g. Squishdot instances)
......
...@@ -295,7 +295,8 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -295,7 +295,8 @@ class ZCatalog(Folder, Persistent, Implicit):
p = paths[i] p = paths[i]
obj = self.resolve_path(p) obj = self.resolve_path(p)
if not obj:
if not obj and hasattr(self, 'REQUEST'):
obj = self.resolve_url(p, self.REQUEST) obj = self.resolve_url(p, self.REQUEST)
if obj is not None: if obj is not None:
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment