From 6eb38ace08e484003a256be076ae2346fed71cad Mon Sep 17 00:00:00 2001
From: Paul J Stevens <paul@nfg.nl>
Date: Wed, 21 Dec 2011 15:07:33 +0100
Subject: [PATCH] fix indexing of comments (#12437)

---
 plone/app/discussion/patches.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plone/app/discussion/patches.py b/plone/app/discussion/patches.py
index 1c591c6..507e416 100644
--- a/plone/app/discussion/patches.py
+++ b/plone/app/discussion/patches.py
@@ -1,13 +1,14 @@
-from Acquisition import aq_inner, aq_base, aq_parent
+from zope.component import queryUtility
+
+from Acquisition import aq_inner, aq_parent
 
 from zope.annotation.interfaces import IAnnotations
 
 from Products.CMFPlone.utils import base_hasattr
 from Products.CMFPlone.utils import safe_callable
 
-from Products.CMFCore.utils import getToolByName
-
 from plone.app.discussion.conversation import ANNOTATION_KEY
+from plone.app.discussion.interfaces import ICommentingTool
 
 # security.declareProtected(ManageZCatalogEntries, 'clearFindAndRebuild')
 def patchedClearFindAndRebuild(self):
@@ -25,14 +26,14 @@ def patchedClearFindAndRebuild(self):
                 obj.indexObject()
 
                 annotions = IAnnotations(obj)
-                catalog = getToolByName(obj, 'portal_catalog', None)
+                discussion = queryUtility(ICommentingTool)
                 if ANNOTATION_KEY in annotions:
                     conversation = annotions[ANNOTATION_KEY]
                     conversation = conversation.__of__(obj)
                     for comment in conversation.getComments():
                         try:
-                            if catalog:
-                                catalog.indexObject(aq_base(comment))
+                            if discussion:
+                                discussion.indexObject(comment)
                         except StopIteration: # pragma: no cover
                             pass