aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-07 13:43:05 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-07 13:43:05 +0000
commitc92c12d5d2dc34214863c4bee72399c09a445394 (patch)
treedd6fe8874b4fb15f7bd99e27d23d6eb72127a189
parentd7ffd11752a2867699831bc761a5f869eb91b400 (diff)
parent02381f2835577bf932c300d22889aa23302b9cf9 (diff)
downloadprosody-c92c12d5d2dc34214863c4bee72399c09a445394.tar.gz
prosody-c92c12d5d2dc34214863c4bee72399c09a445394.zip
Merge
-rw-r--r--plugins/muc/mod_muc.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 4f5831a6..74909d9b 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -255,9 +255,11 @@ for event_name, method in pairs {
-- Watch presence to create rooms
if stanza.attr.type == nil and stanza.name == "presence" then
room = muclib.new_room(room_jid);
- else
+ elseif stanza.attr.type ~= "error" then
origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
return true;
+ else
+ return;
end
end
return room[method](room, origin, stanza);