tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pinned statuses being shown in a featured hashtag (#9971)

Browse Source
This commit is contained in:
Eugen Rochko
2019-02-05 00:27:18 +01:00
committed by GitHub
parent e02a13f64e
commit 2557cb2f95
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View File

@ -52,7 +52,7 @@ class AccountsController < ApplicationController
private
def show_pinned_statuses?
[replies_requested?, media_requested?, params[:max_id].present?, params[:min_id].present?].none?
[replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none?
end
def filtered_statuses

2
app/controllers/settings/featured_tags_controller.rb
View File

@ -38,7 +38,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
end
def set_featured_tags
@featured_tags = current_account.featured_tags.reject(&:new_record?)
@featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
end
def set_most_used_tags