Commit 499e0d9d authored by Andreas Jung's avatar Andreas Jung

- Index constructors were called without acquisition context of the

       calling object. This caused caller.getPhysicalPath() to fail for
       indexes depending on this information.
parent b451271d
...@@ -47,11 +47,16 @@ Zope Changes ...@@ -47,11 +47,16 @@ Zope Changes
- Collector #741: Applied patch to provide better FTP error messages. - Collector #741: Applied patch to provide better FTP error messages.
- Collector #814: PathIndexes now uses IITreeSet instead of
IISet. This should result in less memory usage.
Bugs Fixed Bugs Fixed
- Index constructors were called without acquisition context of the
calling object. This caused caller.getPhysicalPath() to fail for
indexes depending on this information.
- Collector #814: PathIndexes now uses IITreeSet instead of
IISet. This should result in less memory usage.
- Fixed a whitespace problem in Z2.log (AWStats failed to process - Fixed a whitespace problem in Z2.log (AWStats failed to process
Zope logfiles) Zope logfiles)
......
...@@ -19,7 +19,7 @@ from OFS.Folder import Folder ...@@ -19,7 +19,7 @@ from OFS.Folder import Folder
from OFS.FindSupport import FindSupport from OFS.FindSupport import FindSupport
from OFS.ObjectManager import ObjectManager from OFS.ObjectManager import ObjectManager
from DateTime import DateTime from DateTime import DateTime
from Acquisition import Implicit, aq_base from Acquisition import Implicit
from Persistence import Persistent from Persistence import Persistent
from DocumentTemplate.DT_Util import InstanceDict, TemplateDict from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
from DocumentTemplate.DT_Util import Eval from DocumentTemplate.DT_Util import Eval
...@@ -913,9 +913,9 @@ class ZCatalog(Folder, Persistent, Implicit): ...@@ -913,9 +913,9 @@ class ZCatalog(Folder, Persistent, Implicit):
# for new index types is to use an "extra" record. # for new index types is to use an "extra" record.
if 'extra' in base.__init__.func_code.co_varnames: if 'extra' in base.__init__.func_code.co_varnames:
index = base(name, extra=extra, caller=aq_base(self)) index = base(name, extra=extra, caller=self)
else: else:
index = base(name, aq_base(self)) index = base(name, self)
self._catalog.addIndex(name,index) self._catalog.addIndex(name,index)
......
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