aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-07-17 19:36:14 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-07-17 19:36:14 +0500
commitc07f0bf11aa74a992d51c6022f9a2b92be8614d8 (patch)
treef48c1804a66b2b6636178622fd8d0e14f3a07ab9 /plugins/muc
parent41da5ba5b501597586a983f2ef40089de38e7eed (diff)
parentfbcbfcbf8d60bcb8aa9f704d3cf09da3223d4013 (diff)
downloadprosody-c07f0bf11aa74a992d51c6022f9a2b92be8614d8.tar.gz
prosody-c07f0bf11aa74a992d51c6022f9a2b92be8614d8.zip
Merge with trunk.
Diffstat (limited to 'plugins/muc')
-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 cef31298..a9d9336c 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -35,7 +35,7 @@ local component;
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