From cae2a26ee374ea2bd5330e695610c1e15969f9a2 Mon Sep 17 00:00:00 2001 From: Eugen Date: Thu, 20 Apr 2017 03:54:02 +0200 Subject: [PATCH] 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 --- app/controllers/tags_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 6b6c730806..d99aea2ebe 100644 --- 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