From 5b0da52e0a2f0a847921f1ee19f82643969f0c08 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 29 Mar 2011 19:40:44 -0700 Subject: [PATCH] fixed comment socketing bug, post ordering on own profile page. --- app/helpers/sockets_helper.rb | 2 +- lib/diaspora/user/querying.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index e5d94977e..c42a0defd 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -48,7 +48,7 @@ module SocketsHelper v = render_to_string(:partial => 'people/person', :locals => person_hash) elsif object.is_a? Comment - v = render_to_string(:partial => 'comments/comment', :locals => {:comment => object, :person => object.author, :current_user => user}) + v = render_to_string(:partial => 'comments/comment', :locals => {:post => object.post, :comment => object, :person => object.author, :current_user => user}) elsif object.is_a? Like v = render_to_string(:partial => 'likes/likes', :locals => {:likes => object.post.likes, :dislikes => object.post.dislikes}) diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb index ea6e271e5..e6653b1b0 100644 --- a/lib/diaspora/user/querying.rb +++ b/lib/diaspora/user/querying.rb @@ -81,7 +81,7 @@ module Diaspora end def posts_from(person) - return self.person.posts.where(:pending => false) if person == self.person + return self.person.posts.where(:pending => false).order("created_at DESC") if person == self.person con = Contact.arel_table p = Post.arel_table post_ids = []