From abd84cd2a1179ef67130fcad3b773e2ebb70276d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 2 Sep 2014 12:29:22 -0400
Subject: [PATCH] FIX: Redirect to Top was showing "latest" content because it
 was in the preload store.

---
 app/assets/javascripts/discourse/models/topic_list.js      | 2 +-
 app/assets/javascripts/discourse/routes/discovery_route.js | 2 +-
 app/controllers/list_controller.rb                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/topic_list.js b/app/assets/javascripts/discourse/models/topic_list.js
index c28635170a1..0402f4ac188 100644
--- a/app/assets/javascripts/discourse/models/topic_list.js
+++ b/app/assets/javascripts/discourse/models/topic_list.js
@@ -247,7 +247,7 @@ Discourse.TopicList.reopenClass({
   },
 
   find: function(filter, params) {
-    return PreloadStore.getAndRemove("topic_list", finderFor(filter, params)).then(function(result) {
+    return PreloadStore.getAndRemove("topic_list_" + filter, finderFor(filter, params)).then(function(result) {
       return Discourse.TopicList.from(result, filter, params);
     });
   }
diff --git a/app/assets/javascripts/discourse/routes/discovery_route.js b/app/assets/javascripts/discourse/routes/discovery_route.js
index 0f6498b447f..1192de0794b 100644
--- a/app/assets/javascripts/discourse/routes/discovery_route.js
+++ b/app/assets/javascripts/discourse/routes/discovery_route.js
@@ -15,7 +15,7 @@ Discourse.DiscoveryRoute = Discourse.Route.extend(Discourse.ScrollTop, Discourse
     if (transition.targetName.indexOf("discovery.top") === -1 &&
         Discourse.User.currentProp("should_be_redirected_to_top")) {
       Discourse.User.currentProp("should_be_redirected_to_top", false);
-      this.transitionTo("discovery.top");
+      this.replaceWith("discovery.top");
     }
   },
 
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 9e3ce049f41..6fc8c9ab3eb 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -186,7 +186,7 @@ class ListController < ApplicationController
     respond_to do |format|
       format.html do
         @list = list
-        store_preloaded('topic_list', MultiJson.dump(TopicListSerializer.new(list, scope: guardian)))
+        store_preloaded("topic_list_#{list.filter}", MultiJson.dump(TopicListSerializer.new(list, scope: guardian)))
         render 'list'
       end
       format.json do