pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bug] Merge runtime config in full config; Fix bug 77258

Browse Source
This commit is contained in:
PauI Ostrovckij
2025-10-03 15:23:57 +03:00
parent ff967e879c
commit 1fcb0216ea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/sources/operationContext.js
View File

@ -101,7 +101,7 @@ Context.prototype.initFromPubSub = function (data) {
Context.prototype.initTenantCache = async function () {
const runtimeConfig = await runtimeConfigManager.getConfig(this);
const tenantConfig = await tenantManager.getTenantConfig(this);
this.config = utils.deepMergeObjects({}, runtimeConfig, tenantConfig);
this.config = utils.deepMergeObjects(config.util.toObject(), runtimeConfig, tenantConfig);
//todo license and secret
};