From 8c763da4f76fe9c04734cce4325a8b0fd06617b8 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 7 Apr 2009 20:30:04 +0000 Subject: [PATCH] [1.0.X] Fixed #9555: respect the `feed_url` feed parameter. Thanks, sedden. Backport of r10432 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10433 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/syndication/feeds.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/contrib/syndication/feeds.py b/django/contrib/syndication/feeds.py index a1f08107f9..15513faa35 100644 --- a/django/contrib/syndication/feeds.py +++ b/django/contrib/syndication/feeds.py @@ -23,13 +23,14 @@ class Feed(object): item_pubdate = None item_enclosure_url = None feed_type = feedgenerator.DefaultFeed + feed_url = None title_template = None description_template = None def __init__(self, slug, request): self.slug = slug self.request = request - self.feed_url = request.path + self.feed_url = self.feed_url or request.path 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)