Fix UnicodeError in byline

collective · Aug 18, 2014 · dff6c00 · dff6c00
1 parent e9d107e
commit dff6c00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,9 @@
 0.7 (unreleased)
 ----------------
 
+- Fix UnicodeError in byline
+  [pbauer]
+
 - Set a effective_date on auto-publishing notes
   [pbauer]
 

diff --git a/src/collective/noticeboard/adapters.py b/src/collective/noticeboard/adapters.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 from persistent.dict import PersistentDict
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.utils import safe_unicode
 from zope.annotation.interfaces import IAnnotations
 from zope.component import getMultiAdapter
 from zope.interface import implements
@@ -110,7 +111,8 @@ def author(self):
 
     def authorname(self):
         author = self.author()
-        return author and author['fullname'] or self.creator()
+        authorname = author['fullname'] if author else self.creator()
+        return safe_unicode(authorname)
 
     def modified(self):
         util = getToolByName(self.context, 'translation_service')