aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-02-03 13:18:20 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-02-03 13:18:20 +0500
commitc5be7023682d05523a4f64f0cb46cb6ed8d76896 (patch)
tree12edfbae42ba28fefdf375a637b9bdc3778ef0a7 /core
parentab6ab5ac080889ba914a711dbc07a6bbd6060108 (diff)
parentbbb4eabf46f51c0835606c87fb4746b72af8ae5b (diff)
downloadprosody-c5be7023682d05523a4f64f0cb46cb6ed8d76896.tar.gz
prosody-c5be7023682d05523a4f64f0cb46cb6ed8d76896.zip
Merge 0.8->trunk.
Diffstat (limited to 'core')
-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