diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-12-16 02:04:43 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-12-16 02:04:43 +0000 |
| commit | ad5bf650c75aa69e8f8168b3603ec0a787d9a26f (patch) | |
| tree | 0342a9d6cca7783cc788e35fcdb464b904cde942 /plugins | |
| parent | 02bc1d47f4a2a72a45f1a13dbb47813f274cb2d7 (diff) | |
| parent | 975be94ee27690746706dfc360730ae0fbb8f754 (diff) | |
| download | prosody-ad5bf650c75aa69e8f8168b3603ec0a787d9a26f.tar.gz prosody-ad5bf650c75aa69e8f8168b3603ec0a787d9a26f.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 38c97d61..042d3891 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 - 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 |