prosody
0731e5432baa
core/modulemanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/modulemanager.lua @ 3765:0731e5432baa

Merge Tobias->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 17 Dec 2010 13:50:33 +0000
parent 3758:41f174b61b6a
child 3967:1a9bcbaeb55a
comparison
equal deleted inserted replaced
3764:323169f229fa 3765:0731e5432baa
74 local global_modules = set.new(autoload_modules) + set.new(global_modules_enabled) - set.new(global_modules_disabled); 74 local global_modules = set.new(autoload_modules) + set.new(global_modules_enabled) - set.new(global_modules_disabled);
75 if component then 75 if component then
76 global_modules = set.intersection(set.new(component_inheritable_modules), global_modules); 76 global_modules = set.intersection(set.new(component_inheritable_modules), global_modules);
77 end 77 end
78 local modules = global_modules + host_modules; 78 local modules = global_modules + host_modules;
79
80 -- COMPAT w/ pre 0.8
81 if modules:contains("console") then
82 log("error", "The mod_console plugin has been renamed to mod_admin_telnet. Please update your config.");
83 modules:remove("console");
84 modules:add("admin_telnet");
85 end
79 86
80 if component then 87 if component then
81 load(host, component); 88 load(host, component);
82 end 89 end
83 for module in modules do 90 for module in modules do