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
8 years ago · cae2a26ee3
parent b79ba3db8a
commit cae2a26ee3
1 changed files with 2 additions and 2 deletions
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@ -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