Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
r888888888
2013-05-20 16:28:29 -07:00
64 changed files with 271 additions and 101 deletions

View File

@@ -6,10 +6,6 @@ module PostSets
@params = params
@user = ::User.find(user_id)
@favorites = ::Favorite.for_user(user.id).paginate(page, :limit => limit).order("favorites.id desc")
if CurrentUser.user.hide_deleted_posts?
@favorites = @favorites.where("is_deleted = false")
end
end
def limit