summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRaphael Michel <mail@raphaelmichel.de>2015-11-07 14:18:06 +0100
committerTim Graham <timograham@gmail.com>2015-11-17 14:28:18 -0500
commit16945f0e9c57aeabadb6f2e2f150a2687455be40 (patch)
tree6d16352dea219959fa54fcc2e4279121bfb5cecc /docs
parent20d2778597e89fc2de084bdaa128a438fbf12c7b (diff)
Fixed #25695 -- Added template_name parameter to csrf_failure() view.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt9
-rw-r--r--docs/releases/1.10.txt4
2 files changed, 12 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index ff3d420433..92a2ad4980 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -385,6 +385,15 @@ where ``reason`` is a short message (intended for developers or logging, not for
end users) indicating the reason the request was rejected. See
:doc:`/ref/csrf`.
+``django.views.csrf.csrf_failure()`` accepts an additional ``template_name``
+parameter that defaults to ``'403_csrf.html'``. If a template with that name
+exists, it will be used to render the page.
+
+.. versionchanged:: 1.10
+
+ The ``template_name`` parameter and the behavior of searching for a template
+ called ``403_csrf.html`` were added to ``csrf_failure()``.
+
.. setting:: CSRF_HEADER_NAME
CSRF_HEADER_NAME
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 6dbe0362b9..1e51c1dec9 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -114,7 +114,9 @@ Cache
CSRF
^^^^
-* ...
+* The default :setting:`CSRF_FAILURE_VIEW`, ``views.csrf.csrf_failure()`` now
+ accepts an optional ``template_name`` parameter, defaulting to
+ ``'403_csrf.html'``, to control the template used to render the page.
Database backends
^^^^^^^^^^^^^^^^^