Merge with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Sat, 17 Jul 2010 19:36:14 +0500
changeset 3390 a88576f675cb
parent 3389 9e2485880cd6 (current diff)
parent 3388 02e668d64e05 (diff)
child 3391 8ac3f60af3c4
Merge with trunk.
--- a/net/server_event.lua	Sat Jul 17 19:34:06 2010 +0500
+++ b/net/server_event.lua	Sat Jul 17 19:36:14 2010 +0500
@@ -468,7 +468,6 @@
 	function interface_mt:ondrain()
 	end
 	function interface_mt:onstatus()
-		debug("server.lua: Dummy onstatus()")
 	end
 end
 
--- a/plugins/muc/mod_muc.lua	Sat Jul 17 19:34:06 2010 +0500
+++ b/plugins/muc/mod_muc.lua	Sat Jul 17 19:36:14 2010 +0500
@@ -35,7 +35,7 @@
 local max_history_messages = module:get_option_number("max_history_messages");
 
 local function is_admin(jid)
-	return um_is_admin(jid) or um_is_admin(jid, module.host);
+	return um_is_admin(jid, module.host);
 end
 
 local function room_route_stanza(room, stanza) core_post_stanza(component, stanza); end