aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-13 12:53:14 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-13 12:53:14 +0000
commit02bc1d47f4a2a72a45f1a13dbb47813f274cb2d7 (patch)
tree706e1bd214c36daa363bfd6749ab4cafec8faa81 /plugins
parent45408a488aa7a795a70f4d2f0a5a613dc64fdb57 (diff)
parent80c1a2634a90d0394188f8fa9a58caa112fcc30b (diff)
downloadprosody-02bc1d47f4a2a72a45f1a13dbb47813f274cb2d7.tar.gz
prosody-02bc1d47f4a2a72a45f1a13dbb47813f274cb2d7.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/mod_muc.lua2
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