Fix defaultPlugins logic to parse the incoming value

v1.18.x
Julian Lam
parent d986fc7cb6
commit dfd840b001

@ -478,17 +478,24 @@ function enableDefaultPlugins(next) {
process.stdout.write('Enabling default plugins\n'); process.stdout.write('Enabling default plugins\n');
var defaultEnabled = [ var defaultEnabled = [
'nodebb-plugin-composer-default', 'nodebb-plugin-composer-default',
'nodebb-plugin-markdown', 'nodebb-plugin-markdown',
'nodebb-plugin-mentions', 'nodebb-plugin-mentions',
'nodebb-widget-essentials', 'nodebb-widget-essentials',
'nodebb-rewards-essentials', 'nodebb-rewards-essentials',
'nodebb-plugin-soundpack-default', 'nodebb-plugin-soundpack-default',
'nodebb-plugin-emoji-extended' 'nodebb-plugin-emoji-extended'
]; ],
customDefaults = nconf.get('defaultPlugins');
if (Array.isArray(nconf.get('defaultPlugins'))) {
defaultEnabled = defaultEnabled.concat(nconf.get('defaultPlugins')); if (customDefaults && customDefaults.length) {
try {
customDefaults = JSON.parse(customDefaults);
defaultEnabled = defaultEnabled.concat(customDefaults);
} catch (e) {
// Invalid value received
winston.warn('[install/enableDefaultPlugins] Invalid defaultPlugins value received. Ignoring.');
}
} }
defaultEnabled = defaultEnabled.filter(function(plugin, index, array) { defaultEnabled = defaultEnabled.filter(function(plugin, index, array) {

Loading…
Cancel
Save