aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages/views.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-11-19 13:54:49 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-11-19 13:54:49 -0600
commit5db324f7c60506cfb8124dc72ac8f408c341c0a0 (patch)
tree2a63f8f7d176be15a4b7af7cb1660240f203d975 /mediagoblin/user_pages/views.py
parentb4b7b6a57a5ad9a5e52a5d3e05f9ad3d3e8b650a (diff)
parent1a3138addd43d410b03cdd1816e0a62bd217de30 (diff)
downloadmediagoblin-5db324f7c60506cfb8124dc72ac8f408c341c0a0.tar.lz
mediagoblin-5db324f7c60506cfb8124dc72ac8f408c341c0a0.tar.xz
mediagoblin-5db324f7c60506cfb8124dc72ac8f408c341c0a0.zip
Merge remote branch 'remotes/inconexo/441_comment_order'
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 82865bb4..98a21bb4 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -106,11 +106,11 @@ def media_home(request, media, page, **kwargs):
"""
if ObjectId(request.matchdict.get('comment')):
pagination = Pagination(
- page, media.get_comments(), MEDIA_COMMENTS_PER_PAGE,
+ page, media.get_comments(True), MEDIA_COMMENTS_PER_PAGE,
ObjectId(request.matchdict.get('comment')))
else:
pagination = Pagination(
- page, media.get_comments(), MEDIA_COMMENTS_PER_PAGE)
+ page, media.get_comments(True), MEDIA_COMMENTS_PER_PAGE)
comments = pagination()