From d3025fb3ec51d1e0e2a662f47761d2451c1c6b02 Mon Sep 17 00:00:00 2001
From: Ross Patterson <me@rpatterson.net>
Date: Thu, 14 Apr 2011 19:06:24 +0000
Subject: [PATCH] Fix some aq wrapper errors introduced by my previous fix but
 not exposed since the functional tests weren't running.

svn path=/plone.app.discussion/trunk/; revision=48836
---
 plone/app/discussion/conversation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plone/app/discussion/conversation.py b/plone/app/discussion/conversation.py
index e785536..c155885 100644
--- a/plone/app/discussion/conversation.py
+++ b/plone/app/discussion/conversation.py
@@ -244,7 +244,7 @@ class Conversation(Traversable, Persistent, Explicit):
         # Add the annotation if not already done
         annotions = IAnnotations(self.__parent__)
         if not ANNOTATION_KEY in annotions:
-            annotions[ANNOTATION_KEY] = self
+            annotions[ANNOTATION_KEY] = aq_base(self)
 
         # Notify that the object is added. The object must here be
         # acquisition wrapped or the indexing will fail.