From 99e55c82eb2e823d8143d9831d7854349832aa5d Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 29 Mar 2011 16:32:56 -0700 Subject: [PATCH] disambiguate ordering --- lib/diaspora/user/querying.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb index 50711833f..461db41f5 100644 --- a/lib/diaspora/user/querying.rb +++ b/lib/diaspora/user/querying.rb @@ -14,6 +14,7 @@ module Diaspora opts[:type] ||= ['StatusMessage', 'Photo'] opts[:limit] ||= 20 opts[:order] ||= 'created_at DESC' + opts[:order] = '`posts`.' + opts[:order] posts_from_others = Post.joins(:contacts).where(:contacts => {:user_id => self.id}) posts_from_self = self.person.posts.joins(:aspect_visibilities => :aspect).where(:aspects => {:user_id => self.id})