From dbeb378898c79a1326b8b3d02c5bfd3c5d0a9586 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Tue, 30 Mar 2010 20:14:16 +0200
Subject: Bugfix for plugin manager

---
 etherpad/src/etherpad/control/admin/pluginmanager.js | 2 --
 etherpad/src/templates/admin/pluginmanager.ejs       | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/etherpad/src/etherpad/control/admin/pluginmanager.js b/etherpad/src/etherpad/control/admin/pluginmanager.js
index e293592..39edc4a 100644
--- a/etherpad/src/etherpad/control/admin/pluginmanager.js
+++ b/etherpad/src/etherpad/control/admin/pluginmanager.js
@@ -54,8 +54,6 @@ function onRequest() {
 
   renderHtml("admin/pluginmanager.ejs",
    {
-    pluginModules: plugins.pluginModules,
-    plugins: plugins.plugins,
     config: appjet.config,
     bodyClass: 'nonpropad',
     isPro: pro_utils.isProDomainRequest(),
diff --git a/etherpad/src/templates/admin/pluginmanager.ejs b/etherpad/src/templates/admin/pluginmanager.ejs
index 4e08fc9..33b04bf 100644
--- a/etherpad/src/templates/admin/pluginmanager.ejs
+++ b/etherpad/src/templates/admin/pluginmanager.ejs
@@ -93,18 +93,18 @@ limitations under the License. */ %>
          <th>Status</th>
          <th></th>
         </tr>
-        <% for (var plugin in pluginModules) { %>
+        <% for (var plugin in plugins.pluginModules) { %>
          <tr>
-          <td><%= pluginModules[plugin].description %></td>
+          <td><%= plugins.pluginModules[plugin].description %></td>
           <td>
-           <% if (plugins[plugin] !== undefined) { %>
+           <% if (plugins.plugins[plugin] !== undefined) { %>
             Installed
            <% } else { %>
             Not installed
            <% } %>
           </td>
           <td>
-           <% if (plugins[plugin] !== undefined) { %>
+           <% if (plugins.plugins[plugin] !== undefined) { %>
             <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=uninstall">Uninstall</a>
             <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=reinstall">Reinstall</a>
            <% } else { %>
-- 
cgit v1.2.3-1-g7c22