github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:14:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't bother with negative offsets

Browse Source
This commit is contained in:
Robin Ward
2016-05-09 16:33:55 -04:00
parent 66fb02acad
commit 49a6d0b789
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/topic_query.rb
View File

@ -374,7 +374,11 @@ class TopicQuery
result = result.limit(options[:per_page]) unless options[:limit] == false
result = result.visible if options[:visible] || @user.nil? || @user.regular?
result = result.offset(options[:page].to_i * options[:per_page]) if options[:page]
if options[:page]
offset = options[:page].to_i * options[:per_page]
result = result.offset(offset) if offset > 0
end
result
end
@ -463,7 +467,11 @@ class TopicQuery
result = result.visible if options[:visible]
result = result.where.not(topics: {id: options[:except_topic_ids]}).references(:topics) if options[:except_topic_ids]
result = result.offset(options[:page].to_i * options[:per_page]) if options[:page]
if options[:page]
offset = options[:page].to_i * options[:per_page]
result.offset(offset) if offset > 0
end
if options[:topic_ids]
result = result.where('topics.id in (?)', options[:topic_ids]).references(:topics)