From a4e44a32f1c5fa9737b20b12ae641bed77a29b40 Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Fri, 21 Feb 2020 09:01:18 +0200
Subject: [PATCH] - fixed Ultimate Member wrapper's visibility on add/edit user
 page;

---
 includes/admin/assets/js/um-admin-role-wrapper.js | 12 ++++++++++++
 includes/admin/core/class-admin-metabox.php       |  2 +-
 includes/core/class-member-directory-meta.php     |  2 ++
 includes/core/class-member-directory.php          |  2 ++
 includes/core/class-user.php                      |  2 +-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/includes/admin/assets/js/um-admin-role-wrapper.js b/includes/admin/assets/js/um-admin-role-wrapper.js
index 7da1c4ac..33016345 100644
--- a/includes/admin/assets/js/um-admin-role-wrapper.js
+++ b/includes/admin/assets/js/um-admin-role-wrapper.js
@@ -9,8 +9,14 @@ jQuery( document ).ready( function() {
 		if ( jQuery.inArray( jQuery(this).val().substr(3), um_roles ) !== -1 ) {
 			jQuery( '#um_role_selector_wrapper' ).hide();
 			jQuery( '#um-role' ).val('');
+
+			var hide = wp.hooks.applyFilters( 'um_user_screen_block_hiding', true );
+			if ( hide ) {
+				jQuery( '#um_user_screen_block' ).hide();
+			}
 		} else {
 			jQuery( '#um_role_selector_wrapper' ).show();
+			jQuery( '#um_user_screen_block' ).show();
 		}
 	}).trigger('change');
 
@@ -22,8 +28,14 @@ jQuery( document ).ready( function() {
 		if ( jQuery.inArray( jQuery(this).val().substr(3), um_roles ) !== -1 ) {
 			jQuery( '#um_role_existing_selector_wrapper' ).hide();
 			jQuery( '#um-role' ).val('');
+
+			var hide = wp.hooks.applyFilters( 'um_user_screen_block_hiding', true );
+			if ( hide ) {
+				jQuery( '#um_user_screen_block' ).hide();
+			}
 		} else {
 			jQuery( '#um_role_existing_selector_wrapper' ).show();
+			jQuery( '#um_user_screen_block' ).show();
 		}
 	}).trigger('change');
 
diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php
index 325046f7..1ffd34fc 100644
--- a/includes/admin/core/class-admin-metabox.php
+++ b/includes/admin/core/class-admin-metabox.php
@@ -1213,7 +1213,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 
 			if ( $this->in_edit == true ) { // we're editing a field
 				$real_attr = substr( $attribute, 1 );
-				$this->edit_mode_value = (isset( $this->edit_array[ $real_attr ] ) ) ?  $this->edit_array[ $real_attr ] : null;
+				$this->edit_mode_value = (isset( $this->edit_array[ $real_attr ] ) ) ? $this->edit_array[ $real_attr ] : null;
 			}
 
 			switch ( $attribute ) {
diff --git a/includes/core/class-member-directory-meta.php b/includes/core/class-member-directory-meta.php
index 2124c7d0..d64f2eb1 100644
--- a/includes/core/class-member-directory-meta.php
+++ b/includes/core/class-member-directory-meta.php
@@ -219,6 +219,8 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
 					 */
 					$skip_default = apply_filters( "um_query_args_{$field}__filter_meta", false, $this, $field, $value, $filter_type, $is_default );
 
+					$skip_default = apply_filters( 'um_query_args_filter_global_meta', $skip_default, $this, $field, $value, $filter_type, $is_default );
+
 					if ( ! $skip_default ) {
 
 						switch ( $filter_type ) {
diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index 90f0eb78..bc670f5f 100644
--- a/includes/core/class-member-directory.php
+++ b/includes/core/class-member-directory.php
@@ -1528,6 +1528,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 						 */
 						$field_query = apply_filters( "um_query_args_{$field}__filter", false, $field, $value, $filter_type );
 
+						$field_query = apply_filters( 'um_query_args_filter_global', $field_query, $field, $value, $filter_type );
+
 						if ( ! $field_query ) {
 
 							switch ( $filter_type ) {
diff --git a/includes/core/class-user.php b/includes/core/class-user.php
index e7087166..abb0e722 100644
--- a/includes/core/class-user.php
+++ b/includes/core/class-user.php
@@ -709,7 +709,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
 			if ( ! empty( $section_content ) && ! ( is_multisite() && is_network_admin() ) ) {
 
 				if ( $userdata !== 'add-new-user' && $userdata !== 'add-existing-user' ) { ?>
-					<h3><?php esc_html_e( 'Ultimate Member', 'ultimate-member' ); ?></h3>
+					<h3 id="um_user_screen_block"><?php esc_html_e( 'Ultimate Member', 'ultimate-member' ); ?></h3>
 				<?php }
 
 				echo $section_content;