Improve baseUrl handling

pull/117/merge
Lennart kats 2015-06-25 13:15:16 +00:00
rodzic f90d7159bf
commit b44151c184
1 zmienionych plików z 2 dodań i 1 usunięć

Wyświetl plik

@ -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);
}