Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2208 -- Allow empty arguments to be passed to filters. Thanks,…

… mattmcc.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9c0568e21ef8acde73e43cd899cf2a74967489b2 1 parent a27f12f
@malcolmt malcolmt authored
View
2  AUTHORS
@@ -104,7 +104,9 @@ answer newbie questions, and generally made Django that much better:
Eugene Lazutkin <http://lazutkin.com/blog/>
Jeong-Min Lee
Christopher Lenz <http://www.cmlenz.net/>
+ lerouxb@gmail.com
limodou
+ mattmcc
Martin Maney <http://www.chipy.org/Martin_Maney>
Manuzhai
Petar Marić
View
2  django/template/__init__.py
@@ -532,7 +532,7 @@ def __init__(self, token, parser):
constant_arg, i18n_arg, var_arg = match.group("constant_arg", "i18n_arg", "var_arg")
if i18n_arg:
args.append((False, _(i18n_arg.replace(r'\"', '"'))))
- elif constant_arg:
+ elif constant_arg is not None:
args.append((False, constant_arg.replace(r'\"', '"')))
elif var_arg:
args.append((True, var_arg))
View
3  tests/regressiontests/templates/tests.py
@@ -170,6 +170,9 @@ def test_templates(self):
# Escaped backslash using known escape char
'basic-syntax35': (r'{{ var|default_if_none:"foo\now" }}', {"var": None}, r'foo\now'),
+ # Empty strings can be passed as arguments to filters
+ 'basic-syntax36': (r'{{ var|join:"" }}', {'var': ['a', 'b', 'c']}, 'abc'),
+
### COMMENT TAG ###########################################################
'comment-tag01': ("{% comment %}this is hidden{% endcomment %}hello", {}, "hello"),
'comment-tag02': ("{% comment %}this is hidden{% endcomment %}hello{% comment %}foo{% endcomment %}", {}, "hello"),
Please sign in to comment.
Something went wrong with that request. Please try again.