From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 29 Jun 2011 14:33:00 +0000 (+0000)
Subject: OSQA-708, filter the username using smart_unicode, applying patch by @Jonathan Baker
X-Git-Tag: live~229
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/a2ce05e9e572b7416203c7fbd30bb060ba825d0e

OSQA-708, filter the username using smart_unicode, applying patch by @Jonathan Baker

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1084 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index afe166c..3e95355 100644
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -5,8 +5,10 @@ from forum.models import *
 from django.utils.translation import ugettext as _
 from django.contrib.humanize.templatetags.humanize import apnumber
 
+from django.utils.encoding import smart_unicode
 from django.utils.safestring import mark_safe
 from general import NextUrlField, UserNameField, SetPasswordForm
+
 from forum import settings
 
 from forum.modules import call_all_handlers
@@ -213,7 +215,7 @@ class RevisionForm(forms.Form):
 
         date_format = '%c'
         self.fields['revision'].choices = [
-            (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3]))
+            (r[0], u'%s - %s (%s) %s' % (r[0], smart_unicode(r[1]), r[2].strftime(date_format), r[3]))
             for r in revisions]
 
         self.fields['revision'].initial = post.active_revision.revision