Ticket #3760: 3760.patch

django/contrib/syndication/feeds.py

@@ -93 +93 @@
-
-        for item in self.__get_dynamic_attr('items', obj):
-            link = add_domain(current_site.domain, self.__get_dynamic_attr('item_link', item))
+            unique_id = self.__get_dynamic_attr('item_guid', item)
+            if not unique_id:
+                unique_id = link
-            enc = None
-            enc_url = self.__get_dynamic_attr('item_enclosure_url', item)
-            if enc_url:
@@ -111 +114 @@
-                title = title_tmp.render(Context({'obj': item, 'site': current_site})).decode('utf-8'),
-                link = link,
-                description = description_tmp.render(Context({'obj': item, 'site': current_site})).decode('utf-8'),
-link
+unique_id
-                enclosure = enc,
-                pubdate = self.__get_dynamic_attr('item_pubdate', item),
-                author_name = author_name,