From 3e4b6c97a005601e3247cbb92f977a151b10da8d Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 21 Oct 2014 13:48:50 -0400
Subject: [PATCH] closes #2286

---
 src/plugins.js                     | 21 ++++++++++-----------
 src/views/admin/extend/plugins.tpl |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/plugins.js b/src/plugins.js
index ef8078b5c1..73dfa4dff7 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -649,19 +649,18 @@ var fs = require('fs'),
 				}
 
 				async.each(installedPlugins, function(plugin, next) {
-
-					pluginMap[plugin.name] = pluginMap[plugin.name] || {};
-					pluginMap[plugin.name].id = pluginMap[plugin.name].id || plugin.id;
-					pluginMap[plugin.name].name = pluginMap[plugin.name].name || plugin.name;
-					pluginMap[plugin.name].description = plugin.description;
-					pluginMap[plugin.name].url = pluginMap[plugin.name].url || plugin.url;
-					pluginMap[plugin.name].installed = true;
-					pluginMap[plugin.name].active = plugin.active;
-					pluginMap[plugin.name].version = plugin.version;
+					pluginMap[plugin.id] = pluginMap[plugin.id] || {};
+					pluginMap[plugin.id].id = pluginMap[plugin.id].id || plugin.id;
+					pluginMap[plugin.id].name = plugin.name || pluginMap[plugin.id].name;
+					pluginMap[plugin.id].description = plugin.description;
+					pluginMap[plugin.id].url = pluginMap[plugin.id].url || plugin.url;
+					pluginMap[plugin.id].installed = true;
+					pluginMap[plugin.id].active = plugin.active;
+					pluginMap[plugin.id].version = plugin.version;
 
 					getVersion(plugin.id, function(err, version) {
-						pluginMap[plugin.name].latest = version || plugin.version;
-						pluginMap[plugin.name].outdated = pluginMap[plugin.name].latest !== pluginMap[plugin.name].version;
+						pluginMap[plugin.id].latest = version || plugin.version;
+						pluginMap[plugin.id].outdated = pluginMap[plugin.id].latest !== pluginMap[plugin.id].version;
 						next();
 					});
 				}, function(err) {
diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl
index 63e5dbbad0..47be454b4b 100644
--- a/src/views/admin/extend/plugins.tpl
+++ b/src/views/admin/extend/plugins.tpl
@@ -10,8 +10,6 @@
 						<div class="pull-right">
 							<button data-action="toggleActive" class="btn <!-- IF plugins.active --> btn-warning<!-- ELSE --> btn-success<!-- ENDIF plugins.active -->"><i class="fa fa-power-off"></i> <!-- IF plugins.active -->Deactivate<!-- ELSE -->Activate<!-- ENDIF plugins.active --></button>
 
-
-
 							<button data-action="toggleInstall" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
 						</div>