aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages/views.py
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-06-20 16:33:14 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-06-20 16:33:14 +0200
commit2d1f91cc41aca908502ea1d18687b902a5fd90a1 (patch)
tree1d6d425a8ec7a7bfb8490c88d87806d856336d1e /mediagoblin/user_pages/views.py
parent76e21adbd8756159d83bef99b335398519b338f3 (diff)
parent5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff)
downloadmediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.lz
mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.xz
mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.zip
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/user_pages/views.py')
-rw-r--r--mediagoblin/user_pages/views.py4
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'),