- fixed sorting labels issues;

- fixed getting range for slider filters;
This commit is contained in:
nikitasinelnikov
2020-01-22 00:40:20 +02:00
parent 2b150d3860
commit 3a5946d8bb
2 changed files with 12 additions and 4 deletions
+2 -2
View File
@@ -788,7 +788,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
), ARRAY_A );
$range = false;
if ( ! empty( $meta['min_meta'] ) && ! empty( $meta['max_meta'] ) ) {
if ( isset( $meta['min_meta'] ) && isset( $meta['max_meta'] ) ) {
$range = array( $meta['min_meta'], $meta['max_meta'] );
}
@@ -808,7 +808,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
if ( empty( $meta ) || ! isset( $meta['amount'] ) || $meta['amount'] === 1 ) {
$range = false;
} elseif ( ! empty( $meta['min_meta'] ) && ! empty( $meta['max_meta'] ) ) {
} elseif ( isset( $meta['min_meta'] ) && isset( $meta['max_meta'] ) ) {
$range = array( $this->borndate( strtotime( $meta['max_meta'] ) ), $this->borndate( strtotime( $meta['min_meta'] ) ) );
}
+10 -2
View File
@@ -73,13 +73,21 @@ if ( ! empty( $args['enable_sorting'] ) ) {
}
}
$all_sorting_options = UM()->member_directory()->sort_fields;
if ( ! in_array( $default_sorting, $sorting_options_prepared ) ) {
$sorting_options_prepared[] = $default_sorting;
$custom_sorting_titles[ $default_sorting ] = ! empty( $args['sortby_custom_label'] ) ? $args['sortby_custom_label'] : $default_sorting;
$label = $default_sorting;
if ( ! empty( $args['sortby_custom_label'] ) ) {
$label = $args['sortby_custom_label'];
} elseif ( ! empty( $all_sorting_options[ $default_sorting ] ) ) {
$label = $all_sorting_options[ $default_sorting ];
}
$custom_sorting_titles[ $default_sorting ] = $label;
}
if ( ! empty( $sorting_options_prepared ) ) {
$all_sorting_options = UM()->member_directory()->sort_fields;
$sorting_options = array_intersect_key( array_merge( $all_sorting_options, $custom_sorting_titles ), array_flip( $sorting_options_prepared ) );
}