diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-20 12:50:44 -0500 |
| commit | 78c0744077b58fb4c20a965fdbbb52055922d793 (patch) | |
| tree | 8ba6033b3f7d8e19c78f59dca2db8ee97872647c /mediagoblin/user_pages/views.py | |
| parent | cd95cb6d3d6ffa403be5f2b347862929917aa1e3 (diff) | |
| parent | 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff) | |
| download | mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.lz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.tar.xz mediagoblin-78c0744077b58fb4c20a965fdbbb52055922d793.zip | |
Merge remote-tracking branch 'origin/master' into is315
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 88b5dfe5..d6cd6034 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -108,10 +108,10 @@ def atom_feed(request): feed = AtomFeed(request.matchdict['user'], feed_url=request.url, url=request.host_url) - + for entry in cursor: feed.add(entry.get('title'), - entry.get('description'), + entry.get('description_html'), content_type='html', author=request.matchdict['user'], updated=entry.get('created'), |