aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Aurich <paul@darkrain42.org>2011-02-01 17:56:16 -0800
committerPaul Aurich <paul@darkrain42.org>2011-02-01 17:56:16 -0800
commit78a80f36b577ec6adcbcca3e194cac2e423fc1ff (patch)
treed9aee340391aeda7d0bcc6f5daa71bddd04e19bb
parent22bd191f8634a478a7b2ca1a020270471bcd08c6 (diff)
downloadprosody-78a80f36b577ec6adcbcca3e194cac2e423fc1ff.tar.gz
prosody-78a80f36b577ec6adcbcca3e194cac2e423fc1ff.zip
modulemanager: Fix disabling a module on a single host
-rw-r--r--core/modulemanager.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 211b49b6..e8f76aeb 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -68,12 +68,11 @@ function load_modules_for_host(host)
if host_modules_enabled == global_modules_enabled then host_modules_enabled = nil; end
if host_modules_disabled == global_modules_disabled then host_modules_disabled = nil; end
- local host_modules = set.new(host_modules_enabled) - set.new(host_modules_disabled);
local global_modules = set.new(autoload_modules) + set.new(global_modules_enabled) - set.new(global_modules_disabled);
if component then
global_modules = set.intersection(set.new(component_inheritable_modules), global_modules);
end
- local modules = global_modules + host_modules;
+ local modules = (global_modules + set.new(host_modules_enabled)) - set.new(host_modules_disabled);
-- COMPAT w/ pre 0.8
if modules:contains("console") then