summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2011-10-23 15:19:09 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2011-10-23 15:19:09 +0000
commit965c5d7cced0d2e09f5b0c3165c192ab4334331b (patch)
treecfa0750be06f673bd53ed4abaedb81f982372769 /django
parent59c051d1707ec1c32256193221b6ee2e3e533be5 (diff)
Fixed #14202 -- made the atom:link element optional in feeds.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/utils/feedgenerator.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index aa3a729a8a..7d7c7af65c 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -224,7 +224,9 @@ class RssFeed(SyndicationFeed):
handler.addQuickElement(u"title", self.feed['title'])
handler.addQuickElement(u"link", self.feed['link'])
handler.addQuickElement(u"description", self.feed['description'])
- handler.addQuickElement(u"atom:link", None, {u"rel": u"self", u"href": self.feed['feed_url']})
+ if self.feed['feed_url'] is not None:
+ handler.addQuickElement(u"atom:link", None,
+ {u"rel": u"self", u"href": self.feed['feed_url']})
if self.feed['language'] is not None:
handler.addQuickElement(u"language", self.feed['language'])
for cat in self.feed['categories']: