Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Count the records added, including duplicates

This commit is contained in:
Robin Ward 2016-08-12 17:18:12 -04:00
parent aef954784a
commit ec8622a860
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/search.rb
View File

@ -721,8 +721,13 @@ class Search
def aggregate_search(opts = {}) def aggregate_search(opts = {})
post_sql = aggregate_post_sql(opts) post_sql = aggregate_post_sql(opts)
aggregate_posts(post_sql[:default]).each {|p| @results.add(p)} added = 0
if @results.posts.size < @limit aggregate_posts(post_sql[:default]).each do |p|
@results.add(p)
added += 1
end
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