Merge remote branch 'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll_and_gallery'

Conflicts:
	mediagoblin/db/models.py

1 files changed, 3 insertions, 3 deletions

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 37839a00..2b7933a4 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -150,8 +150,7 @@ class MediaEntry(Document):
         cursor = self.db.MediaEntry.find({'_id' : {"$lt": self['_id']}, 
                                           'uploader': self['uploader'],
                                           'state': 'processed'}).sort(
-                                                    '_id', DESCENDING).limit(1)
-                                                    
+                                                    '_id', ASCENDING).limit(1)
         if cursor.count():
             return urlgen('mediagoblin.user_pages.media_home',
                           user=self.uploader()['username'],
@@ -164,7 +163,7 @@ class MediaEntry(Document):
         cursor = self.db.MediaEntry.find({'_id' : {"$gt": self['_id']}, 
                                           'uploader': self['uploader'],
                                           'state': 'processed'}).sort(
-                                                    '_id', ASCENDING).limit(1)
+                                                    '_id', DESCENDING).limit(1)
 
         if cursor.count():
             return urlgen('mediagoblin.user_pages.media_home',
@@ -174,6 +173,7 @@ class MediaEntry(Document):
     def uploader(self):
         return self.db.User.find_one({'_id': self['uploader']})
 
+
 class MediaComment(Document):
     __collection__ = 'media_comments'