Diff

core/usermanager.lua @ 4238:05f991b4a90e

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 05 Apr 2011 13:26:43 +0100
parent 4237:6b0d7d94eb7f
child 4459:2ccc386b9913
line wrap: on
line diff
--- a/core/usermanager.lua	Fri Mar 18 10:33:38 2011 +0000
+++ b/core/usermanager.lua	Tue Apr 05 13:26:43 2011 +0100
@@ -96,6 +96,8 @@
 end
 
 function is_admin(jid, host)
+	if host and not hosts[host] then return false; end
+
 	local is_admin;
 	jid = jid_bare(jid);
 	host = host or "*";