Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #745 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 49007
This commit is contained in:
Julia Radzhabova 2021-03-15 19:06:37 +03:00 committed by GitHub
parent d3d78c6981 da5c48c736
commit 6196a1c8ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/common/main/lib/controller/Plugins.js
View file

@ -646,20 +646,24 @@ define([
warn = false; warn = false;
if (plugins.plugins && plugins.plugins.length>0) if (plugins.plugins && plugins.plugins.length>0)
arr = plugins.plugins; arr = plugins.plugins;
var val = plugins.config.autostart || plugins.config.autoStartGuid; if (plugins && plugins.config) {
if (typeof (val) == 'string') var val = plugins.config.autostart || plugins.config.autoStartGuid;
val = [val]; if (typeof (val) == 'string')
warn = !!plugins.config.autoStartGuid; val = [val];
autostart = val || []; warn = !!plugins.config.autoStartGuid;
autostart = val || [];
}
plugins = this.serverPlugins; plugins = this.serverPlugins;
if (plugins.plugins && plugins.plugins.length>0) if (plugins.plugins && plugins.plugins.length>0)
arr = arr.concat(plugins.plugins); arr = arr.concat(plugins.plugins);
val = plugins.config.autostart || plugins.config.autoStartGuid; if (plugins && plugins.config) {
if (typeof (val) == 'string') val = plugins.config.autostart || plugins.config.autoStartGuid;
val = [val]; if (typeof (val) == 'string')
(warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration."); val = [val];
autostart = autostart.concat(val || []); (warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration.");
autostart = autostart.concat(val || []);
}
this.autostart = autostart; this.autostart = autostart;
this.parsePlugins(arr, false); this.parsePlugins(arr, false);