diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-25 22:38:10 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-25 22:38:10 +0100 |
| commit | 18464b8d1dff20b2ff91cceebc25d46434352495 (patch) | |
| tree | 84b8fc3daf2e43863f8de9098e45f0e73c128404 | |
| parent | 7e9a612898c428e4406834dfe3766bccde7830f5 (diff) | |
| download | etherpad-18464b8d1dff20b2ff91cceebc25d46434352495.tar.gz etherpad-18464b8d1dff20b2ff91cceebc25d46434352495.tar.bz2 etherpad-18464b8d1dff20b2ff91cceebc25d46434352495.zip | |
Made reload of a plugin really reload it, for real, from disk
| -rw-r--r-- | etherpad/src/etherpad/admin/plugins.js | 4 | ||||
| -rw-r--r-- | 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); } |