From 18464b8d1dff20b2ff91cceebc25d46434352495 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Thu, 25 Mar 2010 22:38:10 +0100
Subject: Made reload of a plugin really reload it, for real, from disk

---
 etherpad/src/etherpad/admin/plugins.js               | 4 ++--
 etherpad/src/etherpad/control/admin/pluginmanager.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/etherpad/src/etherpad/admin/plugins.js b/etherpad/src/etherpad/admin/plugins.js
index 41482fc..6fc21f3 100644
--- a/etherpad/src/etherpad/admin/plugins.js
+++ b/etherpad/src/etherpad/admin/plugins.js
@@ -175,8 +175,8 @@ function saveInstalledHooks(pluginName) {
 }
 
 
-function loadPlugins() {
-  if (pluginsLoaded) return;
+function loadPlugins(force) {
+  if (pluginsLoaded && force == undefined) return;
   pluginsLoaded = true;
   loadAvailablePlugins();
   loadInstalledHooks();
diff --git a/etherpad/src/etherpad/control/admin/pluginmanager.js b/etherpad/src/etherpad/control/admin/pluginmanager.js
index 3fb017c..e293592 100644
--- a/etherpad/src/etherpad/control/admin/pluginmanager.js
+++ b/etherpad/src/etherpad/control/admin/pluginmanager.js
@@ -37,6 +37,7 @@ function onRequest() {
    plugins.disablePlugin(request.params.plugin);
   } else if (request.params.action == 'reinstall') {
    plugins.disablePlugin(request.params.plugin);
+   plugins.loadPlugins(1);
    plugins.enablePlugin(request.params.plugin);
   }
 
-- 
cgit v1.2.3-1-g7c22