# HG changeset patch # User Matthew Wild # Date 1227419038 0 # Node ID 29980099ca7e994cc14ccfd4f63336a2d493b848 # Parent 2a81158b1fc7e2f5ad6ff41b4ee707cb55f2928b# Parent de4fa6f3cccfaf5714f9eab21a444ae829bda403 Reverted my change to modulemanager, to restore those made by waqas diff -r 2a81158b1fc7 -r 29980099ca7e core/modulemanager.lua --- a/core/modulemanager.lua Sun Nov 23 05:21:21 2008 +0000 +++ b/core/modulemanager.lua Sun Nov 23 05:43:58 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, ret; + return nil, err; 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][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);