Skip to content
Snippets Groups Projects
Commit cae2a26e authored by Eugen's avatar Eugen Committed by GitHub
Browse files

Fix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182)

* Fix #2120 - Use Status#as_tag_timeline on public hashtag page

* Update tags_controller.rb
parent b79ba3db
No related branches found
No related tags found
No related merge requests found
......@@ -4,8 +4,8 @@ class TagsController < ApplicationController
layout 'public'
def show
@tag = Tag.find_by!(name: params[:id].downcase)
@statuses = @tag.statuses.order('id desc').paginate_by_max_id(20, params[:max_id])
@tag = Tag.find_by(name: params[:id].downcase)
@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)
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment