diff options
| -rw-r--r-- | app/controllers/tags_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 6b6c73080..d99aea2eb 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 |