diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2006-09-26 07:26:07 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2006-09-26 07:26:07 +0000 |
| commit | 9c0568e21ef8acde73e43cd899cf2a74967489b2 (patch) | |
| tree | 9f0ab990597598bff7a5431640c677719913d820 | |
| parent | a27f12f3884de8c51b7f8bf6fd669d38f449360c (diff) | |
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
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | django/template/__init__.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/templates/tests.py | 3 |
3 files changed, 6 insertions, 1 deletions
@@ -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ć diff --git a/django/template/__init__.py b/django/template/__init__.py index fa75f6c2f5..af8f37a474 100644 --- a/django/template/__init__.py +++ b/django/template/__init__.py @@ -532,7 +532,7 @@ class FilterExpression(object): 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)) diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index 368a46b8fb..e46b715490 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -170,6 +170,9 @@ class Templates(unittest.TestCase): # 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"), |