From b567bd3d372d67a2e9094fc041cce47f848629af Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 15 Oct 2013 10:17:32 +1100
Subject: [PATCH] shift site settings in front of routes

---
 app/assets/javascripts/discourse.js             | 1 -
 app/views/common/_discourse_javascript.html.erb | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index d05de2e4837..094c4e9bfc1 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -227,7 +227,6 @@ Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
   **/
   start: function() {
     Discourse.bindDOMEvents();
-    Discourse.SiteSettings = PreloadStore.get('siteSettings');
     Discourse.MessageBus.alwaysLongPoll = Discourse.Environment === "development";
     Discourse.MessageBus.start();
     Discourse.KeyValueStore.init("discourse_", Discourse.MessageBus);
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index bf1eea711a5..b980c8b1b2d 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -21,6 +21,7 @@
   Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname  %>';
   Discourse.BaseUri = '<%= Discourse::base_uri "/" %>';
   Discourse.Environment = '<%= Rails.env %>';
+  Discourse.SiteSettings.login_required && !Discourse.User.current();
   Discourse.Router.map(function() {
     Discourse.routeBuilder.call(this);
   });