aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-23 05:47:55 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-23 05:47:55 +0000
commit37c659a35c38d7302d24f80d72cb5b7c3bf4100a (patch)
treeab7afdfddc4b1612353bef92eb2b124d8e45d69e /core
parentad28eb9f86e1d629460b04ed7b09b730cb68ff9c (diff)
downloadprosody-37c659a35c38d7302d24f80d72cb5b7c3bf4100a.tar.gz
prosody-37c659a35c38d7302d24f80d72cb5b7c3bf4100a.zip
Backed out the backout. Now we're back out.
Diffstat (limited to 'core')
-rw-r--r--core/modulemanager.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f4893089..b0fb6cd9 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -78,7 +78,7 @@ function load(name)
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 @@ function handle_stanza(origin, stanza)
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);