Fix error generating Atom feed upon blank title [#1018].

[mediagoblin.git] / mediagoblin / listings / views.py

diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index 6e1528ca210d208a418a44ac98304770ba8aea9e..4dd935433d10b82332c49f6a308ba8da98fdc9ae 100644 (file)
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -21,6 +21,7 @@ from mediagoblin.decorators import uses_pagination
 from mediagoblin.plugins.api.tools import get_media_file_paths
 from mediagoblin.tools.pagination import Pagination
 from mediagoblin.tools.response import render_to_response
+from mediagoblin.tools.translate import pass_to_ugettext as _
 
 from werkzeug.contrib.atom import AtomFeed
 
@@ -115,7 +116,9 @@ def atom_feed(request):
             content = entry.description_html
 
         feed.add(
-            entry.get('title'),
+            # AtomFeed requires a non-blank title. This situation can occur if
+            # you edit a media item and blank out the existing title.
+            entry.get('title') or _('Untitled'),
             content,
             id=entry.url_for_self(request.urlgen, qualified=True),
             content_type='html',