aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc/mod_muc.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-07-08 02:44:32 +0200
committerKim Alvefur <zash@zash.se>2019-07-08 02:44:32 +0200
commitf1406ebe53dd38003cd1fd3121946ae4924de03c (patch)
tree6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /plugins/muc/mod_muc.lua
parent5399b9b9057f8202ceb25e933d10e1825383bc99 (diff)
parent37fc8f2a2fdaac95d7aee6e51b88514f3febef31 (diff)
downloadprosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.tar.gz
prosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.zip
Merge 0.11->trunk
Diffstat (limited to 'plugins/muc/mod_muc.lua')
-rw-r--r--plugins/muc/mod_muc.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 954bae92..89e67744 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -453,7 +453,7 @@ for event_name, method in pairs {
if room == nil then
-- Watch presence to create rooms
- if stanza.attr.type == nil and stanza.name == "presence" then
+ if stanza.attr.type == nil and stanza.name == "presence" and stanza:get_child("x", "http://jabber.org/protocol/muc") then
room = muclib.new_room(room_jid);
return room:handle_first_presence(origin, stanza);
elseif stanza.attr.type ~= "error" then