aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-15 23:22:27 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-15 23:22:27 +0000
commit669f7ac76a808c91bad5b6b144e459f9144954e8 (patch)
tree54cd29d831ddf750976c9fcedae8308bf687adbb /core
parent60292ade15292d2398d91a1af6a578d6a20c9f34 (diff)
parentfa063a029970ee01ce8307643e334fb1d33a8a74 (diff)
downloadprosody-669f7ac76a808c91bad5b6b144e459f9144954e8.tar.gz
prosody-669f7ac76a808c91bad5b6b144e459f9144954e8.zip
Merge with myself (!)
Diffstat (limited to 'core')
-rw-r--r--core/modulemanager.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index aadd89de..783fea55 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -10,6 +10,7 @@ local type = type;
local tostring, print = tostring, print;
local _G = _G;
+local debug = debug;
module "modulemanager"
@@ -89,14 +90,13 @@ function handle_stanza(origin, stanza)
log("debug", "Stanza is an <iq/>");
local child = stanza.tags[1];
if child then
- local xmlns = child.attr.xmlns;
- log("debug", "Stanza has xmlns: %s", xmlns);
+ 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
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];