aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-12-14 17:25:55 +0100
committerKim Alvefur <zash@zash.se>2013-12-14 17:25:55 +0100
commit5f66fbb5fa606a00ce3981aa122e3ee97f099b87 (patch)
treef09333963a51f34667fb3267cb8ce196e84d7485
parentc680f0d75a09ea19ca159d14ffb68e40ada91c90 (diff)
parent39d6068003836790e511e9f4df76ec2feb24d0ed (diff)
downloadprosody-5f66fbb5fa606a00ce3981aa122e3ee97f099b87.tar.gz
prosody-5f66fbb5fa606a00ce3981aa122e3ee97f099b87.zip
Merge 0.10->trunk
-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 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