diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-23 01:30:58 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-23 01:30:58 +0100 |
commit | 597d3174276ee35ac59a7eb2109469126d054310 (patch) | |
tree | 8907b93b95ab3e10a7e3fc7aaef48a769cd190b0 /plugins/muc | |
parent | 6e9e2d5167ba8b5261b2038bb9360f06681e9483 (diff) | |
parent | 711e2c8713466ff5fa8d1ed29dcf04d6e2b6e0da (diff) | |
download | prosody-597d3174276ee35ac59a7eb2109469126d054310.tar.gz prosody-597d3174276ee35ac59a7eb2109469126d054310.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
-rw-r--r-- | plugins/muc/lock.lib.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/muc/lock.lib.lua b/plugins/muc/lock.lib.lua index 15dd624b..928805ec 100644 --- a/plugins/muc/lock.lib.lua +++ b/plugins/muc/lock.lib.lua @@ -42,6 +42,7 @@ end -- Don't let users into room while it is locked module:hook("muc-occupant-pre-join", function(event) if not event.is_new_room and is_locked(event.room) then -- Deny entry + module:log("debug", "Room is locked, denying entry"); event.origin.send(st.error_reply(event.stanza, "cancel", "item-not-found")); return true; end |