diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
| commit | 8c9d841c3d81694d063bd931dbfee0634f53e8f7 (patch) | |
| tree | 35cdd4996c2ba4c67a4805bd01e3830d1dc171f5 /core/usermanager.lua | |
| parent | 54a5982b5d000a98726601dada57050ac5cb21b4 (diff) | |
| parent | ca74173a8221e9cd93db30c7bb89c8b181f8b60b (diff) | |
| download | prosody-8c9d841c3d81694d063bd931dbfee0634f53e8f7.tar.gz prosody-8c9d841c3d81694d063bd931dbfee0634f53e8f7.zip | |
Merge 0.8->trunk
Diffstat (limited to 'core/usermanager.lua')
| -rw-r--r-- | core/usermanager.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua index 5e2e41fc..0152afd7 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -96,6 +96,8 @@ function get_provider(host) 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 "*"; |