From 1a6b1fdb9159ceb2d5ccc80f3f8ac573d1fc3cc7 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Mon, 25 Jul 2011 06:47:45 +0000
Subject: [PATCH] Use Plone's safe_encode method instead of encode() to make
 sure unicode encoded strings can be indexed too.

svn path=/plone.app.discussion/trunk/; revision=51432
---
 CHANGES.txt                     | 4 ++++
 plone/app/discussion/catalog.py | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b3e554f..596b659 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,10 @@ Changelog
   fixes http://dev.plone.org/plone/ticket/11298.
   [timo]
 
+- Use Plone's safe_encode method instead of encode() to make sure unicode 
+  encoded strings can be indexed too.
+  [timo]
+
 
 2.0.7 (2011-07-15)
 ------------------
diff --git a/plone/app/discussion/catalog.py b/plone/app/discussion/catalog.py
index d0d5bcd..894d719 100644
--- a/plone/app/discussion/catalog.py
+++ b/plone/app/discussion/catalog.py
@@ -10,6 +10,8 @@ from DateTime import DateTime
 
 from Products.CMFCore.interfaces import IContentish
 
+from Products.CMFPlone.utils import safe_unicode
+
 from Products.ZCatalog.interfaces import IZCatalog
 
 from plone.app.discussion.interfaces import IConversation, IComment
@@ -70,7 +72,7 @@ def title(object):
 
 @indexer(IComment)
 def creator(object):
-    return object.creator and object.creator.encode('utf-8')
+    return object.creator and safe_unicode(object.creator)
 
 @indexer(IComment)
 def description(object):