From a626005570e74bb0fec3ac647c93e80b65249b8b Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 11 Mar 2015 18:04:27 -0400
Subject: [PATCH] closes #2851

---
 src/plugins.js      | 32 +++++++-------------------------
 src/plugins/load.js | 12 +++++-------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/plugins.js b/src/plugins.js
index 4d384f3714..c63039be67 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -168,7 +168,7 @@ var fs = require('fs'),
 
 	Plugins.getAll = function(callback) {
 		var url = (nconf.get('registry') || 'https://packages.nodebb.org') + '/api/v1/plugins?version=' + require('../package.json').version;
-		
+
 		require('request')(url, function(err, res, body) {
 			var plugins = [];
 
@@ -262,9 +262,9 @@ var fs = require('fs'),
 
 			function(dirs, next) {
 				dirs = dirs.filter(function(dir){
-					return dir.startsWith('nodebb-plugin-') || 
-						dir.startsWith('nodebb-widget-') || 
-						dir.startsWith('nodebb-rewards-') || 
+					return dir.startsWith('nodebb-plugin-') ||
+						dir.startsWith('nodebb-widget-') ||
+						dir.startsWith('nodebb-rewards-') ||
 						dir.startsWith('nodebb-theme-');
 				}).map(function(dir){
 					return path.join(npmPluginPath, dir);
@@ -272,11 +272,7 @@ var fs = require('fs'),
 
 				async.filter(dirs, function(dir, callback){
 					fs.stat(dir, function(err, stats){
-						if (err) {
-							return callback(false);
-						}
-
-						callback(stats.isDirectory());
+						callback(!err && stats.isDirectory());
 					});
 				}, function(plugins){
 					next(null, plugins);
@@ -287,25 +283,11 @@ var fs = require('fs'),
 				var plugins = [];
 
 				async.each(files, function(file, next) {
-					var configPath;
-
 					async.waterfall([
 						function(next) {
 							Plugins.loadPluginInfo(file, next);
 						},
 						function(pluginData, next) {
-							var packageName = path.basename(file);
-
-							if (!pluginData) {
-								winston.warn("Plugin `" + packageName + "` is corrupted or invalid. Please check either package.json or plugin.json for errors.");
-								return next(null, {
-									id: packageName,
-									installed: true,
-									error: true,
-									active: null
-								});
-							}
-
 							Plugins.isActive(pluginData.name, function(err, active) {
 								if (err) {
 									return next(new Error('no-active-state'));
@@ -319,12 +301,12 @@ var fs = require('fs'),
 								next(null, pluginData);
 							});
 						}
-					], function(err, config) {
+					], function(err, pluginData) {
 						if (err) {
 							return next(); // Silently fail
 						}
 
-						plugins.push(config);
+						plugins.push(pluginData);
 						next();
 					});
 				}, function(err) {
diff --git a/src/plugins/load.js b/src/plugins/load.js
index 89b38fdc64..0637427a12 100644
--- a/src/plugins/load.js
+++ b/src/plugins/load.js
@@ -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]]'));
 			}
 		});
 	};