github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 07:11:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into pm-tags

Browse Source
This commit is contained in:
Vinoth Kannan
2018-02-21 23:55:59 +05:30
committed by GitHub
parent 4d842ef2d5 23f7c3607c
commit 2b509eaa91
357 changed files with 5863 additions and 2023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/topic_query.rb
View File

@ -610,7 +610,7 @@ class TopicQuery
end
if search = options[:search]
result = result.where("topics.id in (select pp.topic_id from post_search_data pd join posts pp on pp.id = pd.post_id where pd.search_data @@ #{Search.ts_query(search.to_s)})")
result = result.where("topics.id in (select pp.topic_id from post_search_data pd join posts pp on pp.id = pd.post_id where pd.search_data @@ #{Search.ts_query(term: search.to_s)})")
end
# NOTE protect against SYM attack can be removed with Ruby 2.2