aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2025-03-22 11:56:23 +0100
committerKim Alvefur <zash@zash.se>2025-03-22 11:56:23 +0100
commit244220453d3f8044bd93c577f9e635df285edad7 (patch)
treea1d7246ed4d066c7219f4b4ff54aea2081f81572 /core
parent8a4d96bb71ea4a3d9e46d9ffd034d5e25d7602e5 (diff)
parent6959547703da2b8137005e391863e7e6399109a6 (diff)
downloadprosody-244220453d3f8044bd93c577f9e635df285edad7.tar.gz
prosody-244220453d3f8044bd93c577f9e635df285edad7.zip
Merge 13.0->trunk
Diffstat (limited to 'core')
-rw-r--r--core/usermanager.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua
index c179e21b..beac547d 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -307,7 +307,8 @@ local function is_admin(jid, host)
end
log("warn", "Usage of legacy is_admin() API, which will be disabled in a future build: %s", debug.traceback());
log("warn", "See https://prosody.im/doc/developers/permissions about the new permissions API");
- return legacy_admin_roles[get_jid_role(jid, host)] or false;
+ local role = get_jid_role(jid, host);
+ return role and legacy_admin_roles[role.name] or false;
end
local function get_users_with_role(role, host)