mirror of
https://github.com/kikobar/mastodon.git
synced 2024-11-18 13:17:35 +00:00
* Fix #2120 - Use Status#as_tag_timeline on public hashtag page * Update tags_controller.rb
This commit is contained in:
parent
b79ba3db8a
commit
cae2a26ee3
|
@ -4,8 +4,8 @@ class TagsController < ApplicationController
|
||||||
layout 'public'
|
layout 'public'
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@tag = Tag.find_by!(name: params[:id].downcase)
|
@tag = Tag.find_by(name: params[:id].downcase)
|
||||||
@statuses = @tag.statuses.order('id desc').paginate_by_max_id(20, params[:max_id])
|
@statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(20, params[:max_id])
|
||||||
@statuses = cache_collection(@statuses, Status)
|
@statuses = cache_collection(@statuses, Status)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue