Ticket #2713: 2713.diff

django/contrib/sitemaps/views.py

@@ -5 +5 @@
 from django.utils.encoding import smart_str
 from django.core.paginator import EmptyPage, PageNotAnInteger
 
-def index(request, sitemaps):
+def index(request, sitemaps, sitemap_url_name=None):
     current_site = Site.objects.get_current()
     sites = []
     protocol = request.is_secure() and 'https' or 'http'
@@ -14 +14 @@
             pages = site().paginator.num_pages
         else:
             pages = site.paginator.num_pages
-        sitemap_url = urlresolvers.reverse('django.contrib.sitemaps.views.sitemap', kwargs={'section': section})
+        sitemap_url_name = sitemap_url_name or 'django.contrib.sitemaps.views.sitemap'
+        sitemap_url = urlresolvers.reverse(sitemap_url_name, kwargs={'section': section})
         sites.append('%s://%s%s' % (protocol, current_site.domain, sitemap_url))
         if pages > 1:
             for page in range(2, pages+1):

docs/ref/contrib/sitemaps.txt

@@ -292 +292 @@
 URLs. In this case, Django will automatically paginate the sitemap, and the
 index will reflect that.
 
+If you are not using the vanilla sitemap view (for example, if it is wrapped
+with a caching decorator), name your sitemap view and pass ``sitemap_url_name``
+to the index view::
+
+   url(r'^sitemap.xml$', sitemap_views.index,
+       {'sitemaps': sitemaps, 'sitemap_url_name': 'sitemaps'}),
+   url(r'^sitemap-(?P<section>.+)\.xml$', cache_page(sitemap_views.sitemap, 86400),
+       {'sitemaps': sitemaps}, name='sitemaps'),  
+
 Pinging Google
 ==============