From 3a5946d8bb55990203c79f5ca66b134f1c74fdf5 Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Wed, 22 Jan 2020 00:40:20 +0200
Subject: [PATCH] - fixed sorting labels issues; - fixed getting range for
 slider filters;

---
 includes/core/class-member-directory.php |  4 ++--
 templates/members.php                    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index 25276107..975913a3 100644
--- a/includes/core/class-member-directory.php
+++ b/includes/core/class-member-directory.php
@@ -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'] ) ) );
 					}
 
diff --git a/templates/members.php b/templates/members.php
index f397a52d..a5bbb2e5 100644
--- a/templates/members.php
+++ b/templates/members.php
@@ -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 ) );
 	}