From b3cb8e0a2bcb47928b2c345dce30b6ab45c6c14a Mon Sep 17 00:00:00 2001
From: danielgrippi <daniel@joindiaspora.com>
Date: Tue, 29 Mar 2011 18:55:00 -0700
Subject: [PATCH] temp fix for pagination.  photos index fix

---
 app/controllers/aspects_controller.rb | 2 +-
 app/controllers/photos_controller.rb  | 4 +---
 lib/diaspora/user/querying.rb         | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 9912895e5..c70dab5b0 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -26,7 +26,7 @@ class AspectsController < ApplicationController
 
     @selected_contacts = @aspects.map { |aspect| aspect.contacts }.flatten.uniq
     @aspect_ids = @aspects.map { |a| a.id }
-    @posts = current_user.raw_visible_posts(:by_members_of => @aspect_ids, :type => 'StatusMessage', :order => session[:sort_order] + ' DESC').includes(
+    @posts = current_user.raw_visible_posts(:by_members_of => @aspect_ids, :type => 'StatusMessage', :order => session[:sort_order] + ' DESC', :page => params[:page]).includes(
       :comments, :mentions, :likes, :dislikes).paginate(:page => params[:page], :per_page => 15, :order => session[:sort_order] + ' DESC')
     @fakes = PostsFake.new(@posts)
 
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index f6161e8a3..ed4beb50a 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -28,9 +28,7 @@ class PhotosController < ApplicationController
         @contacts_of_contact = []
       end
 
-      @posts = current_user.visible_photos.where(
-        :author_id => @person.id
-      ).paginate(:page => params[:page])
+      @posts = current_user.posts_from(@person).where(:type => 'Photo').paginate(:page => params[:page])
 
       render 'people/show'
 
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index f880a6188..6bfa88178 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -15,6 +15,7 @@ module Diaspora
         opts[:limit] ||= 20
         opts[:order] ||= 'updated_at DESC'
         opts[:order] = '`posts`.' + opts[:order]
+        opts[:limit] = opts[:limit] * opts[:page] if opts[:page]
 
         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})