diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-12-13 12:52:39 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-12-13 12:52:39 +0000 |
commit | d4a3ab7b750918ceb5a2c01def4bebab0a9a8230 (patch) | |
tree | 9392b528d10dfc77dde0fb76e4335b1b80e17491 /plugins | |
parent | 02a0ea1c2a31f4cbb28b862eba1c23b248e35cab (diff) | |
parent | 8dfeb6207a594197160c19bb5e3e98aae07c2885 (diff) | |
download | prosody-d4a3ab7b750918ceb5a2c01def4bebab0a9a8230.tar.gz prosody-d4a3ab7b750918ceb5a2c01def4bebab0a9a8230.zip |
Merge 0.9->0.10
Diffstat (limited to 'plugins')
-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 cb967c90..38c97d61 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -164,7 +164,7 @@ function stanza_handler(event) return true; end if not(restrict_room_creation) or - (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or + is_admin(stanza.attr.from)) or (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then room = create_room(bare); end |