From 5045960281d0eddbe42d4d363d504979d8b0b306 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Thu, 18 Aug 2011 06:39:25 +0000
Subject: [PATCH] Make sure the conversation.getComments method returns
 acquisition wrapped comments.

svn path=/plone.app.discussion/trunk/; revision=51639
---
 CHANGES.txt                          | 4 ++++
 plone/app/discussion/conversation.py | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6cef87f..1e04eb4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,10 @@ Changelog
 - Make sure only comments to the content object are removed from the catalog
   when the content object is moved.
   [hannosch, timo]
+  
+- Make sure the conversation.getComments method returns acquisition wrapped 
+  comments.
+  [timo]
 
 
 2.0.9 (2011-07-25)
diff --git a/plone/app/discussion/conversation.py b/plone/app/discussion/conversation.py
index 5ce96ed..63ebc37 100644
--- a/plone/app/discussion/conversation.py
+++ b/plone/app/discussion/conversation.py
@@ -106,7 +106,8 @@ class Conversation(Traversable, Persistent, Explicit):
         """
         count = 0l
         for comment in self._comments.values(min=start):
-            yield comment
+            # Yield the acquisition wrapped comment
+            yield self[comment.id]
 
             count += 1
             if size and count > size: