Mercurial > lxmppd-hg-xmllex / changeset
changeset
Backed out the backout. Now we're back out.
Sun, 23 Nov 2008 05:47:55 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Sun, 23 Nov 2008 05:47:55 +0000
- changeset 397
- d07ae6788196
- parent 396
- 29980099ca7e
- child 400
- 068a813b6454
Backed out the backout. Now we're back out.
| core/modulemanager.lua | file | annotate | diff | comparison | revisions |
--- a/core/modulemanager.lua Sun Nov 23 05:43:58 2008 +0000 +++ b/core/modulemanager.lua Sun Nov 23 05:47:55 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, err; + return nil, ret; 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] and handlers[origin_type][name][xmlns]; - if handler then + local handler = 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);
