From 29891add3d23892f7dd1221d47f15d7455b5926b Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 16 Jul 2007 04:54:49 +0000 Subject: [PATCH] Fixed #4887 -- Fixed another place where template tag arguments are used directly as function keyword args. Thanks, Brian Rosner. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5715 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 1 + django/contrib/comments/templatetags/comments.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/AUTHORS b/AUTHORS index 63b88b625b..69a0dfb3d9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -222,6 +222,7 @@ answer newbie questions, and generally made Django that much better: rhettg@gmail.com Henrique Romano Armin Ronacher + Brian Rosner Oliver Rutherfurd Ivan Sagalaev (Maniac) Vinay Sajip diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py index 5c02c16f95..756ab9c93b 100644 --- a/django/contrib/comments/templatetags/comments.py +++ b/django/contrib/comments/templatetags/comments.py @@ -5,6 +5,7 @@ from django import template from django.template import loader from django.core.exceptions import ObjectDoesNotExist from django.contrib.contenttypes.models import ContentType +from django.utils.encoding import smart_str import re register = template.Library() @@ -174,6 +175,7 @@ class DoCommentForm: if tokens[4] != 'with': raise template.TemplateSyntaxError, "Fourth argument in %r tag must be 'with'" % tokens[0] for option, args in zip(tokens[5::2], tokens[6::2]): + option = smart_str(option) if option in ('photos_optional', 'photos_required') and not self.free: # VALIDATION ############################################## option_list = args.split(',')