diff --git a/public/src/require-config.js b/public/src/require-config.js index 2657d4aa33..4e919329e4 100644 --- a/public/src/require-config.js +++ b/public/src/require-config.js @@ -1,7 +1,7 @@ 'use strict'; require.config({ - baseUrl: config.relative_path + '/assets/src/modules', + baseUrl: config.requireBaseUrl, waitSeconds: 0, urlArgs: config['cache-buster'], paths: { diff --git a/src/controllers/api.js b/src/controllers/api.js index 1e52e8113f..6989841c2d 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -19,6 +19,7 @@ apiController.loadConfig = async function (req) { let config = { relative_path: nconf.get('relative_path'), upload_url: nconf.get('upload_url'), + requireBaseUrl: nconf.get('relative_path') + '/assets/src/modules', 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, '}'),