From acfbf260aa5026641d706e38634235dfbbbf4113 Mon Sep 17 00:00:00 2001 From: Toks Date: Sun, 5 May 2013 07:36:07 -0400 Subject: [PATCH] fixes #1410; fix user argument for favorite post set --- app/controllers/favorites_controller.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/favorites_controller.rb b/app/controllers/favorites_controller.rb index 73b111724..6dce03186 100644 --- a/app/controllers/favorites_controller.rb +++ b/app/controllers/favorites_controller.rb @@ -1,13 +1,18 @@ class FavoritesController < ApplicationController before_filter :member_only + respond_to :html, :xml, :json def index if params[:tags] redirect_to(posts_path(:tags => params[:tags])) - elsif params[:user_id] - @favorite_set = PostSets::Favorite.new(User.find(params[:user_id]), params[:page], params) else - @favorite_set = PostSets::Favorite.new(CurrentUser.user, params[:page], params) + user_id = params[:user_id] || CurrentUser.user.id + @favorite_set = PostSets::Favorite.new(user_id, params[:page], params) + respond_with(@favorite_set.posts) do |format| + format.xml do + render :xml => @favorite_set.posts.to_xml(:root => "posts") + end + end end end