Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: dont overwrite asset_base_url if its set

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-02-25 18:42:45 -05:00
parent e0b1c374e4
commit 0e12f82dd8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/prestart.js
View File

@@ -95,7 +95,9 @@ function loadConfig(configFile) {
nconf.set('secure', urlObject.protocol === 'https:'); nconf.set('secure', urlObject.protocol === 'https:');
nconf.set('use_port', !!urlObject.port); nconf.set('use_port', !!urlObject.port);
nconf.set('relative_path', relativePath); nconf.set('relative_path', relativePath);
if (!nconf.get('asset_base_url')) {
nconf.set('asset_base_url', `${relativePath}/assets`); nconf.set('asset_base_url', `${relativePath}/assets`);
}
nconf.set('port', nconf.get('PORT') || nconf.get('port') || urlObject.port || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567); nconf.set('port', nconf.get('PORT') || nconf.get('port') || urlObject.port || (nconf.get('PORT_ENV_VAR') ? nconf.get(nconf.get('PORT_ENV_VAR')) : false) || 4567);
// cookies don't provide isolation by port: http://stackoverflow.com/a/16328399/122353 // cookies don't provide isolation by port: http://stackoverflow.com/a/16328399/122353