diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-11-23 05:43:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-11-23 05:43:58 +0000 |
| commit | ad28eb9f86e1d629460b04ed7b09b730cb68ff9c (patch) | |
| tree | 8f369ee44352b6d6dc8c61002165cc86c3756860 /core | |
| parent | fe379b9bdb0b4a52eeef2824e89164bc0e32fd44 (diff) | |
| parent | 8ff05fa75ca6dd682a61bc327ea4a0a7b98470d9 (diff) | |
| download | prosody-ad28eb9f86e1d629460b04ed7b09b730cb68ff9c.tar.gz prosody-ad28eb9f86e1d629460b04ed7b09b730cb68ff9c.zip | |
Reverted my change to modulemanager, to restore those made by waqas
Diffstat (limited to 'core')
| -rw-r--r-- | core/modulemanager.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index b0fb6cd9..f4893089 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, ret; + return nil, err; 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][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); |