add extra safety so offset can not be negative

2015-02-26 14:48:56 +11:00 · 2015-02-26 14:48:56 +11:00 · c02f1b026a
parent 9981257880
commit c02f1b026a
1 changed files with 3 additions and 1 deletions
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@ -170,7 +170,9 @@ class TopicQuery
    if page == 0
      (pinned_topics + unpinned_topics)[0...limit] if limit
    else
-      unpinned_topics.offset((page * per_page - pinned_topics.count) - 1).to_a
+      offset = (page * per_page - pinned_topics.count) - 1
+      offset = 0 unless offset > 0
+      unpinned_topics.offset(offset).to_a
    end

  end