From 5b356e446a5a4004914976b599c1394e1df5fe7c Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Mon, 15 Jan 2018 15:42:31 -0500
Subject: [PATCH] FIX: subfolder support was broken

---
 config/application.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/application.rb b/config/application.rb
index a465f8b47d4..20cbc7451ab 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -186,6 +186,10 @@ module Discourse
 
     require 'auth'
 
+    if GlobalSetting.relative_url_root.present?
+      config.relative_url_root = GlobalSetting.relative_url_root
+    end
+
     if Rails.env == "test"
       if ENV['LOAD_PLUGINS'] == "1"
         Discourse.activate_plugins!