summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2010-02-27 21:08:30 +0000
committerLuke Plant <L.Plant.98@cantab.net>2010-02-27 21:08:30 +0000
commitd7abb33e70cf91c983b997cbeafbea2cd0371762 (patch)
tree21b420b2bf9ed2dc61b03dec457f292ae14d1ef5
parent9f592ecced6c489c3f2feb418f9005bebc189cd6 (diff)
Fixed #12933 - AdminSite.admin_view disables @csrf_view_exempt
Thanks to philomat for report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/sites.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index ac8835529e..acaceb4ac4 100644
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@@ -196,7 +196,8 @@ class AdminSite(object):
inner = never_cache(inner)
# We add csrf_protect here so this function can be used as a utility
# function for any view, without having to repeat 'csrf_protect'.
- inner = csrf_protect(inner)
+ if not getattr(view, 'csrf_exempt', False):
+ inner = csrf_protect(inner)
return update_wrapper(inner, view)
def get_urls(self):