From 1833c124d93f48fc11022e5fb77265d0c5066912 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Sun, 2 Jun 2013 14:05:12 -0400
Subject: [PATCH] FIX? : Sometimes preloaded data is missing

---
 app/assets/javascripts/discourse.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index d18190aee54..f0f8309a79d 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -260,8 +260,11 @@ Discourse = Ember.Application.createWithMixins({
     Discourse.MessageBus.alwaysLongPoll = Discourse.Environment === "development";
     Discourse.MessageBus.start();
     Discourse.KeyValueStore.init("discourse_", Discourse.MessageBus);
-    // Make sure we delete preloaded data
-    PreloadStore.remove('siteSettings');
+
+    // Don't remove site settings for now. It seems on some browsers the route
+    // tries to use it after it has been removed
+    // PreloadStore.remove('siteSettings');
+
     // Developer specific functions
     Discourse.Development.setupProbes();
     Discourse.Development.observeLiveChanges();