From 8a0a87812bfd75bb78a120ce18270d5a025be872 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Wed, 14 Oct 2015 12:57:06 +1100
Subject: [PATCH] FIX: navigating back to latest was not respecting pinned
 topics

---
 lib/topic_query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index f396b09cbf4..7637bbaa7be 100644
--- 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