Ticket #3624: feeds.diff

django/contrib/syndication/feeds.py

@@ -85 +85 @@
         try:
             title_tmp = loader.get_template(self.title_template_name)
         except TemplateDoesNotExist:
-            title_tmp = Template('{{ obj }}')
+            title_tmp = self.__get_dynamic_attr('item_title', obj)
+            if not title_tmp:
+                title_tmp = Template('{{ obj }}')
         try:
             description_tmp = loader.get_template(self.description_template_name)
         except TemplateDoesNotExist:
-            description_tmp = Template('{{ obj }}')
+            description_tmp = self.__get_dynamic_attr('item_description', obj)
+            if not description_tmp:
+                description_tmp = Template('{{ obj }}')
 
         for item in self.__get_dynamic_attr('items', obj):
             link = add_domain(current_site.domain, self.__get_dynamic_attr('item_link', item))