Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 04:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: closes #10296

Browse Source 
asset_base_url in nconf
keep assetBaseUrl in config for backwards compat
This commit is contained in:
Barış Soner Uşaklı
2022-02-15 19:22:34 -05:00
parent 5b0d4a8ec9
commit 58b5781cea
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/api.js
View File

@@ -14,6 +14,7 @@ const apiController = module.exports;
const relative_path = nconf.get('relative_path');
const upload_url = nconf.get('upload_url');
const asset_base_url = nconf.get('asset_base_url');
const socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket'];
const socketioOrigins = nconf.get('socket.io:origins');
const websocketAddress = nconf.get('socket.io:address') || '';
@@ -22,7 +23,8 @@ apiController.loadConfig = async function (req) {
const config = {
relative_path,
upload_url,
assetBaseUrl: `${relative_path}/assets`,
asset_base_url,
assetBaseUrl: asset_base_url, // deprecate in 1.20.x
siteTitle: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')),
browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')),
titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'),