From aeb5a13bfa203281aaa5573e19fe5aa6ac012152 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 02 Jan 2026 06:03:55 +0000
Subject: [PATCH] Merge branch 'main' of https://github.com/jakevdwerf/jvb
---
inc/helpers/members.php | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/inc/helpers/members.php b/inc/helpers/members.php
index 007210e..c24ff84 100644
--- a/inc/helpers/members.php
+++ b/inc/helpers/members.php
@@ -35,7 +35,7 @@
*/
function jvbGetUserByFirstName(string $first_name):WP_User|false
{
- $cache = CacheManager::for('userFirstname');
+ $cache = CacheManager::for('userFirstname')->connectTo('user');
$cached = $cache->get($first_name)??false;
if ($cached) {
return get_userdata($cached);
@@ -76,7 +76,7 @@
*/
function jvbGetUserByDisplayName(string $display_name):WP_User|false
{
- $cache = CacheManager::for('user_displaynames');
+ $cache = CacheManager::for('user_displaynames')->connectTo('user');
$cached = $cache->get($display_name)??false;
if ($cached && is_int($cached)) {
@@ -115,7 +115,7 @@
function jvbGetUsername(int $user_id):string
{
$key = 'user_display_names';
- $cache = CacheManager::for('userNames', WEEK_IN_SECONDS);
+ $cache = CacheManager::for('userNames', WEEK_IN_SECONDS)->connectTo('user');
$cached = $cache->get($user_id);
if ($cached) {
@@ -156,7 +156,7 @@
return false;
}
- $cache = CacheManager::for('artist', 3600);
+ $cache = CacheManager::for('artist', 3600)->connectTo('post');
$cached = $cache->get($userID);
if ($cached) {
return match ($return) {
@@ -208,13 +208,12 @@
return 'admin';
}
}
- $user = ($ID === 0) ? wp_get_current_user() : get_userdata($ID);
-
- if (user_can($user, 'manage_options')) {
+ if ($ID > 0 && user_can($ID, 'manage_options')) {
return 'admin';
}
+ $user = ($ID === 0) ? wp_get_current_user() : get_userdata($ID);
return array_values(array_intersect(
- array_keys(JVB_USER),
+ array_keys(array_merge(JVB_USER, ['administrator'])),
array_map(function ($role) {
return jvbNoBase($role);
},
--
Gitblit v1.10.0