mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.8->trunk.

Browse source
This commit is contained in:
Waqas Hussain 2011-02-03 13:18:20 +05:00
commit c5be702368
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/modulemanager.lua
View file

@ -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

2
util/stanza.lua
View file

@ -44,11 +44,13 @@ module "stanza"
stanza_mt = { __type = "stanza" };
stanza_mt.__index = stanza_mt;
local stanza_mt = stanza_mt;
function stanza(name, attr)
local stanza = { name = name, attr = attr or {}, tags = {} };
return setmetatable(stanza, stanza_mt);
end
local stanza = stanza;
function stanza_mt:query(xmlns)
return self:tag("query", { xmlns = xmlns });