summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-03-23 22:00:13 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-03-23 22:00:13 +0000
commit9797d51efe4038637318fc7399a8501be0e563d9 (patch)
tree36765b249891c4dbfbdeeeda4478c2535b3aed47
parentf22418a6becb80770e83eab0fc38190a73f89ed3 (diff)
Fixed an error in the `firstof` template tag when used with `TEMPLATE_STRING_IF_INVALID`. Thanks to Alex Gaynor for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/template/defaulttags.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 14f6532645..c08ecc435c 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -74,7 +74,7 @@ class FirstOfNode(Node):
def render(self, context):
for var in self.vars:
- value = var.resolve(context)
+ value = var.resolve(context, True)
if value:
return smart_unicode(value)
return u''