FIX: navigating back to latest was not respecting pinned topics

2015-10-14 12:57:06 +11:00 · 2015-10-14 12:57:06 +11:00 · 8a0a87812b
parent 22d0f2ef8a
commit 8a0a87812b
1 changed files with 1 additions and 1 deletions
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@ -186,7 +186,7 @@ class TopicQuery
    topics = yield(topics) if block_given?

    options = options.merge(@options)
-    if (options[:order] || "activity") == "activity" && !options[:unordered]
+    if ["activity","default"].include?(options[:order] || "activity") && !options[:unordered]
      topics = prioritize_pinned_topics(topics, options)
    end