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

- review Select2 CSS;

Browse Source 
- fixes for member directory;
This commit is contained in:
nikitasinelnikov
2020-01-29 13:22:03 +02:00
parent 345c05838c
commit f7bbafda7b
5 changed files with 143 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-member-directory-meta.php
+15 -6
View File
@@ -24,6 +24,8 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
var $roles = array();
var $general_meta_joined = false;
var $having = '';
var $select = '';
var $sql_limit = '';
var $sql_order = '';
@@ -592,13 +594,16 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
$order = 'ASC';
$sortby = ! empty( $_POST['sorting'] ) ? $_POST['sorting'] : $directory_data['sortby'];
$sortby = ( $sortby == 'other' ) ? $directory_data['sortby_custom'] : $sortby;
$custom_sort = array();
$sorting_fields = maybe_unserialize( $directory_data['sorting_fields'] );
foreach ( $sorting_fields as $field ) {
if ( is_array( $field ) ) {
$field_keys = array_keys( $field );
$custom_sort[] = $field_keys[0];
if ( ! empty( $directory_data['sorting_fields'] ) ) {
$sorting_fields = maybe_unserialize( $directory_data['sorting_fields'] );
foreach ( $sorting_fields as $field ) {
if ( is_array( $field ) ) {
$field_keys = array_keys( $field );
$custom_sort[] = $field_keys[0];
}
}
}
@@ -722,14 +727,18 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) {
global $wpdb;
$user_ids = $wpdb->get_col(
"SELECT SQL_CALC_FOUND_ROWS DISTINCT u.ID
"SELECT SQL_CALC_FOUND_ROWS DISTINCT u.ID
{$this->select}
FROM {$wpdb->users} AS u
{$sql_join}
WHERE 1=1 {$sql_where}
{$this->having}
{$this->sql_order}
{$this->sql_limit}"
);
//var_dump( $wpdb->last_query );
$total_users = (int) $wpdb->get_var( 'SELECT FOUND_ROWS()' );
$pagination_data = $this->calculate_pagination( $directory_data, $total_users );
includes/core/class-member-directory.php
+9 -6
View File
@@ -512,7 +512,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
switch ( $this->filter_types[ $filter ] ) {
default: {
do_action( "um_member_directory_filter_type_{$this->filter_types[ $filter ]}", $filter, $this->filter_types );
do_action( "um_member_directory_filter_type_{$this->filter_types[ $filter ]}", $filter, $directory_data, $unique_hash, $attrs, $default_value );
break;
}
@@ -1168,13 +1168,16 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
// sort members by
$this->query_args['order'] = 'ASC';
$sortby = ! empty( $_POST['sorting'] ) ? $_POST['sorting'] : $directory_data['sortby'];
$sortby = ( $sortby == 'other' ) ? $directory_data['sortby_custom'] : $sortby;
$custom_sort = array();
$sorting_fields = maybe_unserialize( $directory_data['sorting_fields'] );
foreach ( $sorting_fields as $field ) {
if ( is_array( $field ) ) {
$field_keys = array_keys( $field );
$custom_sort[] = $field_keys[0];
if ( ! empty( $directory_data['sorting_fields'] ) ) {
$sorting_fields = maybe_unserialize( $directory_data['sorting_fields'] );
foreach ( $sorting_fields as $field ) {
if ( is_array( $field ) ) {
$field_keys = array_keys( $field );
$custom_sort[] = $field_keys[0];
}
}
}