Ticket #4933: xheaders.py.diff

django/core/xheaders.py

@@ +1 @@
+from django.conf import settings
+
 """
 Pages in Django can are served up with custom HTTP headers containing useful
 information about those pages -- namely, the content type and object ID.
@@ -4 +6 @@
 
 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. :)
 """
@@ -16 +18 @@
     given HttpRequest object has an IP address within the INTERNAL_IPS setting
     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):
-        response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.object_name.lower())
+    is_internal_ip = is_staff = False
+
+    try:
+        is_internal_ip = request.META['REMOTE_ADDR'] in settings.INTERNAL_IPS
+    except KeyError:
+        pass
+
+    try:
+        is_staff = request.user.is_authenticated() and request.user.is_staff
+    except AttributeError:
+        pass
+
+    if is_internal_ip or is_staff:
+        response['X-Object-Type'] = u"%s.%s" % (
+            model._meta.app_label,
+            model._meta.object_name.lower())
         response['X-Object-Id'] = str(object_id)