diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-23 20:44:48 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-23 20:44:48 +0100 |
| commit | 560094822d86f10450567785544cfcca61dd8a3b (patch) | |
| tree | c2737280276b8ec3642cae5ae644e81da621be04 /core/modulemanager.lua | |
| parent | 3bc6fdb526dec6b56dab9208461d5b2f4db08006 (diff) | |
| parent | 6db47b60f4574bc8e5a34eacac8a67ccd52107dd (diff) | |
| download | prosody-560094822d86f10450567785544cfcca61dd8a3b.tar.gz prosody-560094822d86f10450567785544cfcca61dd8a3b.zip | |
Merging with main branch.
Diffstat (limited to 'core/modulemanager.lua')
| -rw-r--r-- | core/modulemanager.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 783fea55..d313130c 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,8 +92,8 @@ 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][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 |