Log message for revision 109319:
Backported c109102 from 2.12 branch
Changed:
U Zope/branches/2.10/doc/CHANGES.txt
U Zope/branches/2.10/lib/python/Products/ZCTextIndex/ZCTextIndex.py
-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10/doc/CHANGES.txt 2010-02-22 21:41:23 UTC (rev 109318)
+++ Zope/branches/2.10/doc/CHANGES.txt 2010-02-22 21:43:29 UTC (rev 109319)
@@ -8,6 +8,8 @@
Bugs fixed
+ - Protect ZCTextIndex's clear method against storing Acquisition
wrappers.
+
- LP #195761: fixed ZMI XML export / import and restored it to the UI.
Zope 2.10.11 (2010/01/12)
Modified: Zope/branches/2.10/lib/python/Products/ZCTextIndex/ZCTextIndex.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/ZCTextIndex/ZCTextIndex.py
2010-02-22 21:41:23 UTC (rev 109318)
+++ Zope/branches/2.10/lib/python/Products/ZCTextIndex/ZCTextIndex.py
2010-02-22 21:43:29 UTC (rev 109319)
@@ -253,7 +253,7 @@
del self._v_lexicon
except (AttributeError, KeyError):
pass
- self.index = self._index_factory(self.getLexicon())
+ self.index = self._index_factory(aq_base(self.getLexicon()))
## User Interface Methods ##
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
