Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 09:10:25 +08:00
Code Packages Activity Actions 11

badly resolved conflicts

Browse source
This commit is contained in:
Neil Lalonde 2017-07-31 20:28:16 -04:00
parent fa3c240e8b
commit 1fdf2e4d4b
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/search.rb
View file

@ -626,7 +626,7 @@ class Search
.references(:category_search_data) .references(:category_search_data)
.order("topics_month DESC") .order("topics_month DESC")
.secured(@guardian) .secured(@guardian)
.limit(@limit) .limit(limit)
categories.each do |category| categories.each do |category|
@results.add(category) @results.add(category)
@ -643,7 +643,7 @@ class Search
.where("user_search_data.search_data @@ #{ts_query("simple")}") .where("user_search_data.search_data @@ #{ts_query("simple")}")
.order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END") .order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END")
.order("last_posted_at DESC") .order("last_posted_at DESC")
.limit(@limit) .limit(limit)
users.each do |user| users.each do |user|
@results.add(user) @results.add(user)
@ -845,7 +845,7 @@ class Search
added += 1 added += 1
end end
if added < @limit if added < limit
aggregate_posts(post_sql[:remaining]).each { |p| @results.add(p) } aggregate_posts(post_sql[:remaining]).each { |p| @results.add(p) }
end end
end end