diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-12-13 12:53:14 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-12-13 12:53:14 +0000 |
| commit | c680f0d75a09ea19ca159d14ffb68e40ada91c90 (patch) | |
| tree | 706e1bd214c36daa363bfd6749ab4cafec8faa81 /plugins | |
| parent | 0b0e5d0825a2fa2b7ef28423824886b30bb916d7 (diff) | |
| parent | d4a3ab7b750918ceb5a2c01def4bebab0a9a8230 (diff) | |
| download | prosody-c680f0d75a09ea19ca159d14ffb68e40ada91c90.tar.gz prosody-c680f0d75a09ea19ca159d14ffb68e40ada91c90.zip | |
Merge 0.10->trunk
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 |