projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
615cc33
)
Backed out the backout. Now we're back out.
author
Matthew Wild
<mwild1@gmail.com>
Sun, 23 Nov 2008 05:47:55 +0000
(
05:47
+0000)
committer
Matthew Wild
<mwild1@gmail.com>
Sun, 23 Nov 2008 05:47:55 +0000
(
05:47
+0000)
core/modulemanager.lua
patch
|
blob
|
history
diff --git
a/core/modulemanager.lua
b/core/modulemanager.lua
index f48930897fcaafd12cd63f7547551789d03777e5..b0fb6cd9b7dc39b21707a15dea3aba408e410cad 100644
(file)
--- 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");
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
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);
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];
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);
handler = handler[xmlns];
if handler then
log("debug", "Passing stanza to mod_%s", handler_info[handler].name);