Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #505 -- ssi template tag now displays a message instead of fail…

…ing silently if DEBUG=True. Thanks, Manuzhai

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cee6faf43ed92c5b276ca4d2e1754a72fbc00ce1 1 parent 7136eb8
@adrianholovaty adrianholovaty authored
Showing with 10 additions and 3 deletions.
  1. +10 −3 django/core/template/defaulttags.py
View
13 django/core/template/defaulttags.py
@@ -211,8 +211,12 @@ def __init__(self, filepath, parsed):
self.filepath, self.parsed = filepath, parsed
def render(self, context):
+ from django.conf.settings import DEBUG
if not include_is_allowed(self.filepath):
- return '' # Fail silently for invalid includes.
+ if DEBUG:
+ return "[Didn't have permission to include file]"
+ else:
+ return '' # Fail silently for invalid includes.
try:
fp = open(self.filepath, 'r')
output = fp.read()
@@ -223,8 +227,11 @@ def render(self, context):
try:
t = Template(output)
return t.render(context)
- except TemplateSyntaxError:
- return '' # Fail silently for invalid included templates.
+ except (TemplateSyntaxError, e):
+ if DEBUG:
+ return "[Included template had syntax error: %s]" % e
+ else:
+ return '' # Fail silently for invalid included templates.
return output
class LoadNode(Node):
Please sign in to comment.
Something went wrong with that request. Please try again.