Changeset

5942:b5e8843cfbeb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 14 Dec 2013 17:25:55 +0100
parents 5940:783107f85ea0 (current diff) 5941:31f14991070b (diff)
children 5947:49fb5835965e
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua	Fri Dec 13 12:53:14 2013 +0000
+++ b/plugins/muc/mod_muc.lua	Sat Dec 14 17:25:55 2013 +0100
@@ -164,7 +164,7 @@
 			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