summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorNick Johnson <njohnson@limcollective.com>2015-09-11 16:35:21 -0700
committerTim Graham <timograham@gmail.com>2015-09-21 19:57:12 -0400
commit392f64842f678b6e29a2e5fac65a586d9c9a57ff (patch)
treee2d1b29e3144e9fbe0ce5726580a8ab232ea6d49 /docs/ref
parent85c52743f7b99ac6575d87080a9ffb7540acbf18 (diff)
Fixed #25373 -- Added warning logging for exceptions during {% include %} tag rendering.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/templates/builtins.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 1c5840d508..d032d7b1cc 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -673,9 +673,14 @@ if it's missing or has syntax errors), the behavior varies depending on the
:class:`template engine's <django.template.Engine>` ``debug`` option (if not
set, this option defaults to the value of :setting:`DEBUG`). When debug mode is
turned on, an exception like :exc:`~django.template.TemplateDoesNotExist` or
-:exc:`~django.template.TemplateSyntaxError` will be raised; otherwise
-``{% include %}`` silences any exception that happens while rendering the
-included template and returns an empty string.
+:exc:`~django.template.TemplateSyntaxError` will be raised. When debug mode
+is turned off, ``{% include %}`` logs a warning to the ``django.template``
+logger with the exception that happens while rendering the included template
+and returns an empty string.
+
+.. versionchanged:: 1.9
+
+ Template logging now includes the warning logging mentioned above.
.. note::
The :ttag:`include` tag should be considered as an implementation of