Skip to content
Snippets Groups Projects
Unverified Commit 50edf848 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Fix search API not resolving URL when type is given (#11822)

Fix #11771
parent 0762258a
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@ class SearchService < BaseService
default_results.tap do |results|
if url_query?
results.merge!(url_resource_results) unless url_resource.nil?
results.merge!(url_resource_results) unless url_resource.nil? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
elsif @query.present?
results[:accounts] = perform_accounts_search! if account_searchable?
results[:statuses] = perform_statuses_search! if full_text_searchable?
......@@ -69,7 +69,7 @@ class SearchService < BaseService
end
def url_query?
@resolve && @options[:type].blank? && @query =~ /\Ahttps?:\/\//
@resolve && @query =~ /\Ahttps?:\/\//
end
def url_resource_results
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment