summaryrefslogtreecommitdiff
path: root/django/contrib/auth/admin.py
diff options
context:
space:
mode:
authorBouke Haarsma <bouke@webatoom.nl>2013-10-15 22:36:49 +0200
committerTim Graham <timograham@gmail.com>2013-10-17 09:42:28 -0400
commit2fb5a51fa3ac276efc7121ec9de91f092a986104 (patch)
tree77f8d7072b079cb9cddb1e8e05bb613681705f7b /django/contrib/auth/admin.py
parent98788d3c3af9f6cce2b94c276d17726f46608b08 (diff)
Fixed #18659 -- Deprecated request.REQUEST and MergeDict
Thanks Aymeric Augustin for the suggestion.
Diffstat (limited to 'django/contrib/auth/admin.py')
-rw-r--r--django/contrib/auth/admin.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py
index ff08f41798..8514f3bfcf 100644
--- a/django/contrib/auth/admin.py
+++ b/django/contrib/auth/admin.py
@@ -144,7 +144,8 @@ class UserAdmin(admin.ModelAdmin):
'adminForm': adminForm,
'form_url': form_url,
'form': form,
- 'is_popup': IS_POPUP_VAR in request.REQUEST,
+ 'is_popup': (IS_POPUP_VAR in request.POST or
+ IS_POPUP_VAR in request.GET),
'add': True,
'change': False,
'has_delete_permission': False,