From 2cebe4395e9ed345bbbe346b91842b4c97ffcfc7 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 12 Apr 2010 13:56:38 +0000 Subject: Refs #13167 -- Corrected a regression in the way non-existent variables are handled by {% if %} tags. Thanks to ohmi2 for pointing out the regression in 1.2, and Karen for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12954 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/defaulttags.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 9dd5fb766f..96efa32c0f 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -243,7 +243,12 @@ class IfNode(Node): yield node def render(self, context): - if self.var.eval(context): + try: + var = self.var.eval(context) + except VariableDoesNotExist: + var = None + + if var: return self.nodelist_true.render(context) else: return self.nodelist_false.render(context) -- cgit v1.3