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 | 80c1a2634a90d0394188f8fa9a58caa112fcc30b (patch) | |
| tree | 9392b528d10dfc77dde0fb76e4335b1b80e17491 /plugins | |
| parent | 33ea9b5ab750619bac0431e71e5d636ce463fe0c (diff) | |
| parent | adc2d4f169267b619ab6224ddf198f3437bac21a (diff) | |
| download | prosody-80c1a2634a90d0394188f8fa9a58caa112fcc30b.tar.gz prosody-80c1a2634a90d0394188f8fa9a58caa112fcc30b.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 |