From e7d8f5f9c8bba6bd5cbbca338291a923760aca6e Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 31 Oct 2017 15:46:03 -0400
Subject: [PATCH] FIX: support /my routes with subfolders

---
 app/assets/javascripts/discourse/lib/url.js.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 1f989f297e..2fe1b79a8b 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -193,10 +193,10 @@ const DiscourseURL = Ember.Object.extend({
     path = path.replace(/(https?\:)?\/\/[^\/]+/, '');
 
     // Rewrite /my/* urls
-    if (path.indexOf('/my/') === 0) {
+    if (path.indexOf(Discourse.BaseUri + '/my/') === 0) {
       const currentUser = Discourse.User.current();
       if (currentUser) {
-        path = path.replace('/my/', userPath(currentUser.get('username_lower') + "/"));
+        path = path.replace(Discourse.BaseUri + '/my/', userPath(currentUser.get('username_lower') + "/"));
       } else {
         document.location.href = "/404";
         return;