From 5d4d031f593407e888e4873e798ea6f77a13a1a1 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 2 May 2015 08:18:45 +0930
Subject: [PATCH] Preload session as the last step in initialisation before
 boot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Can’t remember why…
---
 framework/core/js/forum/src/app.js            | 2 +-
 framework/core/js/lib/initializers/preload.js | 4 ++++
 framework/core/js/lib/initializers/session.js | 5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/framework/core/js/forum/src/app.js b/framework/core/js/forum/src/app.js
index fedf78534..a96fa35a8 100644
--- a/framework/core/js/forum/src/app.js
+++ b/framework/core/js/forum/src/app.js
@@ -10,11 +10,11 @@ import boot from 'flarum/initializers/boot';
 var app = new App();
 
 app.initializers.add('store', store);
-app.initializers.add('preload', preload);
 app.initializers.add('session', session);
 app.initializers.add('routes', routes);
 app.initializers.add('components', components);
 app.initializers.add('timestamps', timestamps);
+app.initializers.add('preload', preload, {last: true});
 app.initializers.add('boot', boot, {last: true});
 
 export default app;
diff --git a/framework/core/js/lib/initializers/preload.js b/framework/core/js/lib/initializers/preload.js
index fb3c2b0a3..0d370db2e 100644
--- a/framework/core/js/lib/initializers/preload.js
+++ b/framework/core/js/lib/initializers/preload.js
@@ -2,4 +2,8 @@ export default function(app) {
   if (app.preload.data) {
     app.store.pushPayload({data: app.preload.data});
   }
+  if (app.preload.session) {
+    app.session.token(app.preload.session.token);
+    app.session.user(app.store.getById('users', app.preload.session.userId));
+  }
 };
diff --git a/framework/core/js/lib/initializers/session.js b/framework/core/js/lib/initializers/session.js
index bc5d74b10..b0ddba1cf 100644
--- a/framework/core/js/lib/initializers/session.js
+++ b/framework/core/js/lib/initializers/session.js
@@ -2,9 +2,4 @@ import Session from 'flarum/session';
 
 export default function(app) {
   app.session = new Session();
-
-  if (app.preload.session) {
-    app.session.token(app.preload.session.token);
-    app.session.user(app.store.getById('users', app.preload.session.userId));
-  }
 }