aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-11-10 19:54:38 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-11-10 19:54:38 +0500
commit24245b60d112dcee347bf7c073b4715782ca0c23 (patch)
tree3e28c84c25bfbd70d066e65ffe72f541f7b34975
parent00a385a310c67cca133145d89e3f1d2bc544ada0 (diff)
downloadprosody-24245b60d112dcee347bf7c073b4715782ca0c23.tar.gz
prosody-24245b60d112dcee347bf7c073b4715782ca0c23.zip
modulemanager: load_modules_for_host(): For components, the inherited modules are the intersection of the inheritable and global modules lists, not the difference.
-rw-r--r--core/modulemanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index d6471850..e228e48d 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -73,7 +73,7 @@ function load_modules_for_host(host)
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.new(component_inheritable_modules) - global_modules;
+ global_modules = set.intersection(set.new(component_inheritable_modules), global_modules);
end
local modules = global_modules + host_modules;