diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-07 13:43:05 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-07 13:43:05 +0000 |
| commit | 7fc54d8b6628899909ae4c0c50030490caab5abe (patch) | |
| tree | dd6fe8874b4fb15f7bd99e27d23d6eb72127a189 | |
| parent | 6c59f3565f5d2a268655c8750b5deba680a71355 (diff) | |
| parent | 8e852d367ef16f7142cb605af07e533796e52ef0 (diff) | |
| download | prosody-7fc54d8b6628899909ae4c0c50030490caab5abe.tar.gz prosody-7fc54d8b6628899909ae4c0c50030490caab5abe.zip | |
Merge
| -rw-r--r-- | plugins/muc/mod_muc.lua | 4 |
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); |