aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-10-25 01:32:30 +0200
committerKim Alvefur <zash@zash.se>2017-10-25 01:32:30 +0200
commit732bb3c8408748b602f28cd2c27bee6fce67d37f (patch)
tree05790f7698486aa2433085e2478a8638de5e9cd0 /core
parent87e144edf3540ee5d7e2443272207e52078e2298 (diff)
parent695e80fad2270d317dd3b45b0d2ef2c9aec7062d (diff)
downloadprosody-732bb3c8408748b602f28cd2c27bee6fce67d37f.tar.gz
prosody-732bb3c8408748b602f28cd2c27bee6fce67d37f.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r--core/stanza_router.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 2312614c..0be92f88 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -140,7 +140,8 @@ function core_process_stanza(origin, stanza)
if h then
local event;
if xmlns == nil then
- if stanza.name == "iq" and (stanza.attr.type == "set" or stanza.attr.type == "get") then
+ if stanza.name == "iq" and (stanza.attr.type == "set" or stanza.attr.type == "get")
+ and stanza.tags[1] and stanza.tags[1].attr.xmlns then
event = "stanza/iq/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name;
else
event = "stanza/"..stanza.name;