* Enhancements:

- Updated select2 JS library to 4.0.12 version
  - Added a few member directories filters for 3rd-party integrations

* Bugfixes:

  - Added labels for member directories filters to increase Accessibility points in Audit
  - Fixed activation licenses with sslverify
This commit is contained in:
nikitasinelnikov
2020-01-24 14:59:47 +02:00
parent 3a5946d8bb
commit 6903822e2c
72 changed files with 196 additions and 121 deletions
@@ -2047,6 +2047,19 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
if ( ! is_wp_error( $request ) ) {
$request = json_decode( wp_remote_retrieve_body( $request ) );
} else {
$request = wp_remote_post(
UM()->store_url,
array(
'timeout' => UM()->request_timeout,
'sslverify' => true,
'body' => $api_params
)
);
if ( ! is_wp_error( $request ) ) {
$request = json_decode( wp_remote_retrieve_body( $request ) );
}
}
$request = ( $request ) ? maybe_unserialize( $request ) : false;
+2
View File
@@ -449,6 +449,8 @@ if ( ! class_exists( 'um\core\Account' ) ) {
function predefined_fields_hook( $predefined_fields ) {
$account_hide_in_directory = UM()->options()->get( 'account_hide_in_directory' );
$account_hide_in_directory = apply_filters( 'um_account_hide_in_members_visibility', $account_hide_in_directory );
if ( ! $account_hide_in_directory ) {
unset( $predefined_fields['hide_in_members'] );
}
@@ -749,7 +749,13 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
um_reset_user();
// end of user card
wp_send_json_success( array( 'pagination' => $pagination_data, 'users' => $users, 'is_search' => $this->is_search ) );
$member_directory_response = apply_filters( 'um_ajax_get_members_response', array(
'pagination' => $pagination_data,
'users' => $users,
'is_search' => $this->is_search,
), $directory_data );
wp_send_json_success( $member_directory_response );
}
}
}
+4 -7
View File
@@ -519,8 +519,9 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
case 'text': {
$filter_from_url = ! empty( $_GET[ 'filter_' . $filter . '_' . $unique_hash ] ) ? $_GET[ 'filter_' . $filter . '_' . $unique_hash ] : $default_value; ?>
<input type="text" autocomplete="off" id="<?php echo $filter; ?>" name="<?php echo $filter; ?>"
placeholder="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
value="<?php echo esc_attr( $filter_from_url ) ?>" class="um-form-field" />
placeholder="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
value="<?php echo esc_attr( $filter_from_url ) ?>" class="um-form-field"
aria-label="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>" />
<?php
break;
}
@@ -642,6 +643,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
<select class="um-s1" id="<?php echo esc_attr( $filter ); ?>" name="<?php echo esc_attr( $filter ); ?><?php if ( $admin && count( $attrs['options'] ) > 1 ) { ?>[]<?php } ?>"
data-placeholder="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
aria-label="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
<?php if ( $admin && count( $attrs['options'] ) > 1 ) { ?>multiple<?php } ?>
<?php echo $custom_dropdown; ?>>
@@ -2375,13 +2377,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
add_filter( 'pre_user_query', array( &$this, 'pagination_changes' ), 10, 1 );
//var_dump( $this->query_args );
$user_query = new \WP_User_Query( $this->query_args );
//var_dump( $user_query->request );
//exit;
remove_filter( 'pre_user_query', array( &$this, 'pagination_changes' ), 10 );
remove_filter( 'get_meta_sql', array( &$this, 'change_meta_sql' ), 10 );