From 9b24edc3917b6daacc90a83adf8d16ab932854c9 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 29 Oct 2018 07:25:17 +1030
Subject: [PATCH] Fix regression in admin routing in subdirectory. fixes #1606

Because admin routing uses the "hash" strategy, the base path does not
need to be taken into account.
---
 framework/core/js/src/common/Application.js     | 3 +--
 framework/core/js/src/forum/ForumApplication.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/core/js/src/common/Application.js b/framework/core/js/src/common/Application.js
index 3b36cb43a..9950c7dd0 100644
--- a/framework/core/js/src/common/Application.js
+++ b/framework/core/js/src/common/Application.js
@@ -150,13 +150,12 @@ export default class Application {
     });
   }
 
-  mount() {
+  mount(basePath = '') {
     this.modal = m.mount(document.getElementById('modal'), <ModalManager/>);
     this.alerts = m.mount(document.getElementById('alerts'), <AlertManager/>);
 
     this.drawer = new Drawer();
 
-    const basePath = this.forum.attribute('basePath');
     m.route(
       document.getElementById('content'),
       basePath + '/',
diff --git a/framework/core/js/src/forum/ForumApplication.js b/framework/core/js/src/forum/ForumApplication.js
index 4a1439ead..eed6ae574 100644
--- a/framework/core/js/src/forum/ForumApplication.js
+++ b/framework/core/js/src/forum/ForumApplication.js
@@ -96,7 +96,7 @@ export default class ForumApplication extends Application {
     this.composer = m.mount(document.getElementById('composer'), Composer.component());
 
     m.route.mode = 'pathname';
-    super.mount();
+    super.mount(this.forum.attribute('basePath'));
 
     alertEmailConfirmation(this);