Software / code / prosody
Changeset
396:29980099ca7e
Reverted my change to modulemanager, to restore those made by waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 23 Nov 2008 05:43:58 +0000 |
| parents | 394:2a81158b1fc7 (current diff) 395:de4fa6f3cccf (diff) |
| children | 397:d07ae6788196 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/core/modulemanager.lua Sun Nov 23 05:21:21 2008 +0000 +++ b/core/modulemanager.lua Sun Nov 23 05:43:58 2008 +0000 @@ -78,7 +78,7 @@ local success, ret = pcall(mod); if not success then log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil"); - return nil, ret; + return nil, err; end return true; end @@ -92,15 +92,15 @@ if child then local xmlns = child.attr.xmlns or xmlns; log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns); - local handler = handlers[origin_type][name][xmlns]; - if handler then + local handler = handlers[origin_type][name] and handlers[origin_type][name][xmlns]; + if handler then log("debug", "Passing stanza to mod_%s", handler_info[handler].name); return handler(origin, stanza) or true; end end elseif handlers[origin_type] then local handler = handlers[origin_type][name]; - if handler then + if handler then handler = handler[xmlns]; if handler then log("debug", "Passing stanza to mod_%s", handler_info[handler].name);
