From 8466373c639c5fe20f9ee16a326aef8a0de5a29d Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 10 Aug 2020 11:36:11 +0300
Subject: [PATCH] - fixed roles in query for usermeta table;

---
 includes/admin/core/class-admin-forms.php     | 2 +-
 includes/core/class-member-directory-meta.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/admin/core/class-admin-forms.php b/includes/admin/core/class-admin-forms.php
index f43f8b40..881f74d4 100644
--- a/includes/admin/core/class-admin-forms.php
+++ b/includes/admin/core/class-admin-forms.php
@@ -914,7 +914,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
 			$id = ( ! empty( $this->form_data['prefix_id'] ) ? $this->form_data['prefix_id'] : '' ) . '_' . $field_data['id'];
 			$id_attr = ' id="' . esc_attr( $id ) . '" ';
 
-			$class = ! empty( $field_data['class'] ) ? $field_data['class'] : '';
+			$class = ! empty( $field_data['class'] ) ? $field_data['class'] . ' ' : ' ';
 			$class .= ! empty( $field_data['size'] ) ? 'um-' . $field_data['size'] . '-field' : 'um-long-field';
 			$class_attr = ' class="um-forms-field ' . esc_attr( $class ) . '" ';
 
diff --git a/includes/core/class-member-directory-meta.php b/includes/core/class-member-directory-meta.php
index 8404bdef..57a77a85 100644
--- a/includes/core/class-member-directory-meta.php
+++ b/includes/core/class-member-directory-meta.php
@@ -569,11 +569,11 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
 
 				if ( ! $view_roles ) {
 					$view_roles = array();
+				} else {
+					$this->roles_in_query = true;
 				}
 
 				$this->roles = array_merge( $this->roles, maybe_unserialize( $view_roles ) );
-
-				$this->roles_in_query = true;
 			}
 
 			if ( ! empty( $directory_data['roles'] ) ) {
@@ -596,6 +596,7 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
 
 				$this->where_clauses[] = '( ' . implode( ' OR ', $roles_clauses ) . ' )';
 			} else {
+
 				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' )";