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 | 1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a (patch) | |
| tree | 35cdd4996c2ba4c67a4805bd01e3830d1dc171f5 /core/usermanager.lua | |
| parent | 272ca5fce11d42d9cd3b50c0f3baa03729583443 (diff) | |
| parent | ca74173a8221e9cd93db30c7bb89c8b181f8b60b (diff) | |
| download | prosody-1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a.tar.gz prosody-1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a.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 "*"; |