diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
| commit | 0692c01e4c7b88ce94fe023607109fb978c36c2e (patch) | |
| tree | c906a6068f9d3d5e84b1e66bf063e57bbbd70a47 /mediagoblin/user_pages/views.py | |
| parent | 079868489479550d9d8190cde6109cc39cd6272c (diff) | |
| parent | 44e51d3464e719e596e1480b7af2957742a9085b (diff) | |
| download | mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.lz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.xz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.zip | |
Merge remote branch 'remotes/jwandborg/issue_363'
Conflicts:
setup.py
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'), |