Log message for revision 109318:
Backported c109102 from 2.12 branch
Changed:
U Zope/branches/2.11/doc/CHANGES.txt
U Zope/branches/2.11/lib/python/Products/ZCTextIndex/ZCTextIndex.py
-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.11/doc/CHANGES.txt 2010-02-22 19:41:17 UTC (rev 109317)
+++ Zope/branches/2.11/doc/CHANGES.txt 2010-02-22 21:41:23 UTC (rev 109318)
@@ -8,6 +8,8 @@
Bugs Fixed
+ - Protect ZCTextIndex's clear method against storing Acquisition
wrappers.
+
- LP #195761: fixed ZMI XML export / import.
- MailHost should fall back to HELO when EHLO fails.
Modified: Zope/branches/2.11/lib/python/Products/ZCTextIndex/ZCTextIndex.py
===================================================================
--- Zope/branches/2.11/lib/python/Products/ZCTextIndex/ZCTextIndex.py
2010-02-22 19:41:17 UTC (rev 109317)
+++ Zope/branches/2.11/lib/python/Products/ZCTextIndex/ZCTextIndex.py
2010-02-22 21:41:23 UTC (rev 109318)
@@ -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
