10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed member directory roles query;

Browse Source
This commit is contained in:
nikitasinelnikov
2020-07-23 16:06:59 +03:00
parent f9759e84e8
commit 4be0e70bac
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-member-directory-meta.php
+17 -1
View File
@@ -22,6 +22,8 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
var $where_clauses = array();
var $roles = array();
var $roles_in_query = false;
var $general_meta_joined = false;
var $having = '';
@@ -393,6 +395,8 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
if ( empty( $this->roles ) && ! is_multisite() ) {
$this->joins[] = "LEFT JOIN {$wpdb->prefix}um_metadata umm_roles ON ( umm_roles.user_id = u.ID AND umm_roles.um_key = '" . $wpdb->get_blog_prefix( $blog_id ) . "capabilities' )";
$this->roles = $value;
$this->roles_in_query = true;
}
$roles_clauses = array();
@@ -568,6 +572,8 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
}
$this->roles = array_merge( $this->roles, maybe_unserialize( $view_roles ) );
$this->roles_in_query = true;
}
if ( ! empty( $directory_data['roles'] ) ) {
@@ -576,6 +582,8 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
} else {
$this->roles = array_merge( $this->roles, maybe_unserialize( $directory_data['roles'] ) );
}
$this->roles_in_query = true;
}
if ( ! empty( $this->roles ) ) {
@@ -588,10 +596,18 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
$this->where_clauses[] = '( ' . implode( ' OR ', $roles_clauses ) . ' )';
} else {
if ( is_multisite() ) {
if ( ! $this->roles_in_query && is_multisite() ) {
// select users who have capabilities for current blog
$this->joins[] = "LEFT JOIN {$wpdb->prefix}um_metadata umm_roles ON ( umm_roles.user_id = u.ID AND umm_roles.um_key = '" . $wpdb->get_blog_prefix( $blog_id ) . "capabilities' )";
$this->where_clauses[] = "umm_roles.um_value IS NOT NULL";
} else {
$member_directory_response = apply_filters( 'um_ajax_get_members_response', array(
'pagination' => $this->calculate_pagination( $directory_data, 0 ),
'users' => array(),
'is_search' => $this->is_search,
), $directory_data );
wp_send_json_success( $member_directory_response );
}
}
includes/core/class-member-directory.php
+15 -1
View File
@@ -1047,10 +1047,14 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
*
*/
function hide_by_role() {
if ( ! is_user_logged_in() ) {
return;
}
$roles = um_user( 'can_view_roles' );
$roles = maybe_unserialize( $roles );
if ( empty( $roles ) || ! UM()->roles()->um_user_can( 'can_view_all' ) ) {
if ( UM()->roles()->um_user_can( 'can_view_all' ) && empty( $roles ) ) {
return;
}
@@ -2429,6 +2433,16 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
unset( $this->query_args['meta_query'] );
}
if ( isset( $this->query_args['role__in'] ) && empty( $this->query_args['role__in'] ) ) {
$member_directory_response = apply_filters( 'um_ajax_get_members_response', array(
'pagination' => $this->calculate_pagination( $directory_data, 0 ),
'users' => array(),
'is_search' => $this->is_search,
), $directory_data );
wp_send_json_success( $member_directory_response );
}
/**
* UM hook
*