From fcec755f01cfaba2a85bfc9511876debbce98631 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 17 Aug 2007 15:05:54 +0000 Subject: newforms-admin: Merged from trunk up to [5916] git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5918 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/xheaders.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'django/core/xheaders.py') diff --git a/django/core/xheaders.py b/django/core/xheaders.py index 3beb930158..34335f12c5 100644 --- a/django/core/xheaders.py +++ b/django/core/xheaders.py @@ -4,7 +4,7 @@ information about those pages -- namely, the content type and object ID. This module contains utility functions for retrieving and doing interesting things with these special "X-Headers" (so called because the HTTP spec demands -that custom headers are prefxed with "X-"). +that custom headers are prefixed with "X-"). Next time you're at slashdot.org, watch out for X-Fry and X-Bender. :) """ @@ -17,6 +17,8 @@ def populate_xheaders(request, response, model, object_id): or if the request is from a logged in staff member. """ from django.conf import settings - if request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or (hasattr(request, 'user') and request.user.is_authenticated() and request.user.is_staff): + if (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS + or (hasattr(request, 'user') and request.user.is_authenticated() + and request.user.is_staff)): response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.object_name.lower()) response['X-Object-Id'] = str(object_id) -- cgit v1.3