diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-07-17 19:36:14 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-07-17 19:36:14 +0500 |
| commit | c07f0bf11aa74a992d51c6022f9a2b92be8614d8 (patch) | |
| tree | f48c1804a66b2b6636178622fd8d0e14f3a07ab9 | |
| parent | 41da5ba5b501597586a983f2ef40089de38e7eed (diff) | |
| parent | fbcbfcbf8d60bcb8aa9f704d3cf09da3223d4013 (diff) | |
| download | prosody-c07f0bf11aa74a992d51c6022f9a2b92be8614d8.tar.gz prosody-c07f0bf11aa74a992d51c6022f9a2b92be8614d8.zip | |
Merge with trunk.
| -rw-r--r-- | net/server_event.lua | 1 | ||||
| -rw-r--r-- | plugins/muc/mod_muc.lua | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 0331e793..a63e20d7 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -468,7 +468,6 @@ do function interface_mt:ondrain() end function interface_mt:onstatus() - debug("server.lua: Dummy onstatus()") end end 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 |