From 37ba8a2c8ec078d00b450c65265c69906104cb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 15 Feb 2022 19:22:34 -0500
Subject: [PATCH] fix: use asset_base_url

---
 public/src/ajaxify.js            | 2 +-
 public/src/modules/translator.js | 2 +-
 src/controllers/api.js           | 4 +++-
 test/mocks/databasemock.js       | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index d42a0b89d1..a3cd09757b 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -424,7 +424,7 @@ ajaxify = window.ajaxify || {};
 	};
 
 	ajaxify.loadTemplate = function (template, callback) {
-		require([config.assetBaseUrl + '/templates/' + template + '.js'], callback, function (err) {
+		require([config.asset_base_url + '/templates/' + template + '.js'], callback, function (err) {
 			console.error('Unable to load template: ' + template);
 			throw err;
 		});
diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index 00572536d5..eb40cf658f 100644
--- a/public/src/modules/translator.js
+++ b/public/src/modules/translator.js
@@ -3,7 +3,7 @@
 (function (factory) {
 	function loadClient(language, namespace) {
 		return new Promise(function (resolve, reject) {
-			jQuery.getJSON([config.assetBaseUrl, 'language', language, namespace].join('/') + '.json?' + config['cache-buster'], function (data) {
+			jQuery.getJSON([config.asset_base_url, 'language', language, namespace].join('/') + '.json?' + config['cache-buster'], function (data) {
 				const payload = {
 					language: language,
 					namespace: namespace,
diff --git a/src/controllers/api.js b/src/controllers/api.js
index 984ea98e42..3032fc80ff 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -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, '&#123;').replace(/}/g, '&#125;'),
diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index 911398b708..414cb7cfdd 100644
--- a/test/mocks/databasemock.js
+++ b/test/mocks/databasemock.js
@@ -38,6 +38,7 @@ nconf.defaults({
 const urlObject = url.parse(nconf.get('url'));
 const relativePath = urlObject.pathname !== '/' ? urlObject.pathname : '';
 nconf.set('relative_path', relativePath);
+nconf.set('asset_base_url', `${relativePath}/assets`);
 nconf.set('upload_path', path.join(nconf.get('base_dir'), nconf.get('upload_path')));
 nconf.set('upload_url', '/assets/uploads');
 nconf.set('url_parsed', urlObject);