IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: do not show PM topics when moving posts to an existing public topic (#6876)

Browse Source
This commit is contained in:
Arpit Jalan
2019-01-14 15:00:45 +05:30
committed by GitHub
parent 78748f1501
commit a121d40771
5 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/search_controller.rb
View File

@@ -68,6 +68,7 @@ class SearchController < ApplicationController
search_args[:search_type] = :header
search_args[:ip_address] = request.remote_ip
search_args[:user_id] = current_user.id if current_user.present?
search_args[:restrict_to_archetype] = params[:restrict_to_archetype] if params[:restrict_to_archetype].present?
search = Search.new(params[:term], search_args)
result = search.execute