Ticket #10235: sitemaps_requestsite_2.diff

django/contrib/sitemaps/__init__.py

@@ -1 +1 @@
 from django.core import urlresolvers, paginator
+from django.contrib.sites.models import get_current
 import urllib
 
 PING_URL = "http://www.google.com/webmasters/tools/ping"
@@ -60 +61 @@
     paginator = property(_get_paginator)
 
     def get_urls(self, page=1):
-        from django.contrib.sites.models import Site
-        current_site = Site.objects.get_current()
+        current_site = get_current(self.request)
         urls = []
         for item in self.paginator.page(page).object_list:
             loc = "http://%s%s" % (current_site.domain, self.__get('location', item))

django/contrib/sitemaps/views.py

@@ -1 +1 @@
 from django.http import HttpResponse, Http404
 from django.template import loader
-from django.contrib.sites.models import Site
+from django.contrib.sites.models import get_current
 from django.core import urlresolvers
 from django.utils.encoding import smart_str
 from django.core.paginator import EmptyPage, PageNotAnInteger
 
 def index(request, sitemaps):
-    current_site = Site.objects.get_current()
+    current_site = get_current(request)
     sites = []
     protocol = request.is_secure() and 'https' or 'http'
     for section, site in sitemaps.items():
+        site.request = request
         if callable(site):
             pages = site().paginator.num_pages
         else:
@@ -32 +33 @@
         maps = sitemaps.values()
     page = request.GET.get("p", 1)
     for site in maps:
+        site.request = request
         try:
             if callable(site):
                 urls.extend(site().get_urls(page))

django/contrib/sites/models.py

@@ -69 +69 @@
 
     def delete(self):
         raise NotImplementedError('RequestSite cannot be deleted.')
+
+def get_current(request):
+    """
+    Checks if contrib.sites is installed and returns either the current
+    ``Site`` object from the database or the current ``RequestSite`` object 
+    from the request.
+    """
+    if Site._meta.installed:
+        current_site = Site.objects.get_current()
+    else:
+        current_site = RequestSite(request)
+    return current_site