From fbae051559b5465ddd4a959dbd72d8178d05c577 Mon Sep 17 00:00:00 2001 From: Robert Wittams Date: Wed, 23 Nov 2005 21:33:19 +0000 Subject: [PATCH] Fix #885 git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1375 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/template/loader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/django/core/template/loader.py b/django/core/template/loader.py index 26d68cd8f5..10989424db 100644 --- a/django/core/template/loader.py +++ b/django/core/template/loader.py @@ -21,7 +21,7 @@ # installed, because pkg_resources is necessary to read eggs. from django.core.exceptions import ImproperlyConfigured -from django.core.template import Origin, StringOrigin, Template, Context, Node, TemplateDoesNotExist, TemplateSyntaxError, resolve_variable_with_filters, register_tag +from django.core.template import Origin, StringOrigin, Template, Context, Node, TemplateDoesNotExist, TemplateSyntaxError, resolve_variable_with_filters, resolve_variable, register_tag from django.conf.settings import TEMPLATE_LOADERS, TEMPLATE_DEBUG template_source_loaders = [] @@ -207,9 +207,11 @@ class IncludeNode(Node): template_name = resolve_variable(self.template_name, context) t = get_template(template_name) return t.render(context) - except Exception, e: + except TemplateSyntaxError, e: if TEMPLATE_DEBUG: raise + return '' + except: return '' # Fail silently for invalid included templates. def do_block(parser, token):