Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 29891add3d23892f7dd1221d47f15d7455b5926b 1 parent 58096c4
@malcolmt malcolmt authored
Showing with 3 additions and 0 deletions.
  1. +1 −0  AUTHORS
  2. +2 −0  django/contrib/comments/templatetags/comments.py
View
1  AUTHORS
@@ -222,6 +222,7 @@ answer newbie questions, and generally made Django that much better:
rhettg@gmail.com
Henrique Romano <onaiort@gmail.com>
Armin Ronacher
+ Brian Rosner <brosner@gmail.com>
Oliver Rutherfurd <http://rutherfurd.net/>
Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
Vinay Sajip <vinay_sajip@yahoo.co.uk>
View
2  django/contrib/comments/templatetags/comments.py
@@ -5,6 +5,7 @@
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 @@ def __call__(self, parser, token):
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(',')
Please sign in to comment.
Something went wrong with that request. Please try again.