diff options
| author | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
| commit | 0269157c4511472cf0bf377d84f6e99876f83d12 (patch) | |
| tree | 8cd84a76fb673cbfefa00ba1516bd16150f1c780 /plugins/muc/mod_muc.lua | |
| parent | a4764762b3dad679f40dadd6eb2eb31ea1d5cace (diff) | |
| parent | 9a5a3fd0f10693e6cba2779095398614eb94e68c (diff) | |
| download | prosody-0269157c4511472cf0bf377d84f6e99876f83d12.tar.gz prosody-0269157c4511472cf0bf377d84f6e99876f83d12.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins/muc/mod_muc.lua')
| -rw-r--r-- | plugins/muc/mod_muc.lua | 2 |
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 |