From b44151c184fa0b3214b09091c2cd38d1aace05a0 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Thu, 25 Jun 2015 13:15:16 +0000 Subject: [PATCH] Improve baseUrl handling --- server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 21e8c702..8a51fb98 100755 --- a/server.js +++ b/server.js @@ -178,6 +178,7 @@ function replaceDomains(settings, domains) { var primaryDomain = domains[0]; settings.domains = domains; settings.primaryDomain = replaceDomain(settings.primaryDomain, primaryDomain); + settings.primaryBaseUrl = replaceDomain(settings.primaryBaseUrl, primaryDomain); for (var s in settings) { if (settings[s].baseUrl) settings[s].baseUrl = replaceDomain(settings[s].baseUrl, primaryDomain); @@ -191,5 +192,5 @@ function replaceDomains(settings, domains) { } function replaceDomain(url, domain) { - return url.replace(/[^./]+\.[^./]+$/, domain).replace(/[^./]+\.[^.]+\//, domain + "/"); + return url.replace("$DOMAIN", domain); } \ No newline at end of file