Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't crash if plugin doesnt set defaultLang

Browse Source
This commit is contained in:
barisusakli
2016-11-29 20:15:45 +03:00
parent afef79a81e
commit f8caed95db
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/load.js
View File

@@ -261,7 +261,7 @@ module.exports = function (Plugins) {
} }
var pathToFolder = path.join(__dirname, '../../node_modules/', pluginData.id, pluginData.languages); var pathToFolder = path.join(__dirname, '../../node_modules/', pluginData.id, pluginData.languages);
var defaultLang = pluginData.defaultLang.replace('_', '-').replace('@', '-x-'); var defaultLang = (pluginData.defaultLang || 'en_GB').replace('_', '-').replace('@', '-x-');
utils.walk(pathToFolder, function (err, languages) { utils.walk(pathToFolder, function (err, languages) {
if (err) { if (err) {
@@ -346,9 +346,11 @@ module.exports = function (Plugins) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
var pluginData;
var packageData;
try { try {
var pluginData = JSON.parse(results.plugin); pluginData = JSON.parse(results.plugin);
var packageData = JSON.parse(results.package); packageData = JSON.parse(results.package);
pluginData.id = packageData.name; pluginData.id = packageData.name;
pluginData.name = packageData.name; pluginData.name = packageData.name;
@@ -356,16 +358,15 @@ module.exports = function (Plugins) {
pluginData.version = packageData.version; pluginData.version = packageData.version;
pluginData.repository = packageData.repository; pluginData.repository = packageData.repository;
pluginData.nbbpm = packageData.nbbpm; pluginData.nbbpm = packageData.nbbpm;
callback(null, pluginData);
} catch(err) { } catch(err) {
var pluginDir = pluginPath.split(path.sep); var pluginDir = pluginPath.split(path.sep);
pluginDir = pluginDir[pluginDir.length - 1]; pluginDir = pluginDir[pluginDir.length - 1];
winston.error('[plugins/' + pluginDir + '] Error in plugin.json or package.json! ' + err.message); winston.error('[plugins/' + pluginDir + '] Error in plugin.json or package.json! ' + err.message);
callback(new Error('[[error:parse-error]]')); return callback(new Error('[[error:parse-error]]'));
} }
callback(null, pluginData);
}); });
}; };
}; };