Ticket #2912: pass_http_request.patch

django/contrib/syndication/feeds.py

@@ -19 +19 @@
     title_template = None
     description_template = None
 
-    def __init__(self, slug, feed_url):
+    def __init__(self, slug, request):
         self.slug = slug
-        self.feed_url = feed_url
+        self.feed_url = request.path
+        self.request = request
         self.title_template_name = self.title_template or ('feeds/%s_title.html' % slug)
         self.description_template_name = self.description_template or ('feeds/%s_description.html' % slug)
 

django/contrib/syndication/views.py

@@ -16 +16 @@
         raise Http404, "Slug %r isn't registered." % slug
 
     try:
-        feedgen = f(slug, request.path).get_feed(param)
+        feedgen = f(slug, request).get_feed(param)
     except feeds.FeedDoesNotExist:
         raise Http404, "Invalid feed parameters. Slug %r is valid, but other parameters, or lack thereof, are not." % slug