Skip to content
GitLab
Unverified Commit 26478f46 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Remove language filtering from hashtag timelines (#19563)

parent a529d6d9
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 2 deletions
+0 -2
app/controllers/api/v1/timelines/tag_controller.rb
+ 0
- 1
View file @ 26478f46
...@@ -36,7 +36,6 @@ class Api::V1::Timelines::TagController < Api::BaseController ...@@ -36,7 +36,6 @@ class Api::V1::Timelines::TagController < Api::BaseController
TagFeed.new( TagFeed.new(
@tag, @tag,
current_account, current_account,
locale: content_locale,
any: params[:any], any: params[:any],
all: params[:all], all: params[:all],
none: params[:none], none: params[:none],
......
app/models/tag_feed.rb
+ 0
- 1
View file @ 26478f46
...@@ -33,7 +33,6 @@ class TagFeed < PublicFeed ...@@ -33,7 +33,6 @@ class TagFeed < PublicFeed
scope.merge!(remote_only_scope) if remote_only? scope.merge!(remote_only_scope) if remote_only?
scope.merge!(account_filters_scope) if account? scope.merge!(account_filters_scope) if account?
scope.merge!(media_only_scope) if media_only? scope.merge!(media_only_scope) if media_only?
scope.merge!(language_scope)
scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id) scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
end end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment