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

closes #2851

Browse Source
This commit is contained in:
barisusakli
2015-03-11 18:04:27 -04:00
parent 8d313d2f16
commit a626005570
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/load.js
View File

@@ -14,14 +14,12 @@ module.exports = function(Plugins) {
Plugins.loadPlugin = function(pluginPath, callback) {
Plugins.loadPluginInfo(pluginPath, function(err, pluginData) {
if (err) {
if (err.message === '[[error:parse-error]]') {
return callback();
}
return callback(pluginPath.match('nodebb-theme') ? null : err);
}
var staticDir;
if (!pluginData) {
return callback();
}
versionWarning(pluginData);
async.parallel([
@@ -229,9 +227,9 @@ module.exports = function(Plugins) {
var pluginDir = pluginPath.split(path.sep);
pluginDir = pluginDir[pluginDir.length -1];
winston.error('[plugins/' + pluginDir + '] Error in plugin.json/package.json! ' + err.message);
winston.error('[plugins/' + pluginDir + '] Error in plugin.json or package.json! ' + err.message);
callback();
callback(new Error('[[error:parse-error]]'));
}
});
};