about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-20 03:54:02 +0200
committerGitHub <noreply@github.com>2017-04-20 03:54:02 +0200
commitcae2a26ee374ea2bd5330e695610c1e15969f9a2 (patch)
tree753ee438d327ca9c8c5d5bdd192374b42f4093fb /app/controllers
parentb79ba3db8a2c494b994f7cb7b6e70d8f945f8820 (diff)
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
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/tags_controller.rb4
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