Fixed #14046 -- Made {% include %} behave the same, regardless of whether the…

Fixed #14046 -- Made {% include %} behave the same, regardless of whether the template included is named by variable or constant string. Thanks to defcube for the report, and George Karpenkov for the draft patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15413 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -258,6 +258,7 @@ answer newbie questions, and generally made Django that much better:
     Bahadır Kandemir <bahadir@pardus.org.tr>
     Karderio <karderio@gmail.com>
     Nagy Károly <charlie@rendszergazda.com>
+    George Karpenkov <george@metaworld.ru>
     Erik Karulf <erik@karulf.com>
     Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
     Ian G. Kelly <ian.g.kelly@gmail.com>

django/template/loader_tags.py

@@ -168,12 +168,10 @@ class IncludeNode(BaseIncludeNode):
             template_name = self.template_name.resolve(context)
             template = get_template(template_name)
             return self.render_template(template, context)
-        except TemplateSyntaxError:
+        except:
             if settings.TEMPLATE_DEBUG:
                 raise
             return ''
-        except:
-            return '' # Fail silently for invalid included templates.
 
 def do_block(parser, token):
     """

tests/regressiontests/templates/templatetags/bad_tag.py

+from django import template
+
+register = template.Library()
+
+@register.tag
+def badtag(parser, token):
+    raise RuntimeError("I am a bad tag")

tests/regressiontests/templates/templatetags/broken_tag.py

-from django import Xtemplate
+from django import Xtemplate
\ No newline at end of file