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

[osqa.git] / forum / forms / qanda.py

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index afe166ce6b4302e85e08ba11bbac164ce145857b..3e95355a79e46ad9173b47c2a451f236e8d16e68 100644 (file)
--- 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.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 django.utils.safestring import mark_safe
 from general import NextUrlField, UserNameField, SetPasswordForm

+

 from forum import settings
 
 from forum.modules import call_all_handlers
 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 = [
 
         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
             for r in revisions]
 
         self.fields['revision'].initial = post.active_revision.revision