From cdaeb12d072d132b57daaa5eae97c0fcf9e8aacc Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Sat, 16 Apr 2016 20:28:20 +0800
Subject: [PATCH] Fix search member filter and fields

---
 core/um-actions-members.php |  2 +-
 core/um-members.php         |  6 +++---
 core/um-short-functions.php | 15 +++++++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/um-actions-members.php b/core/um-actions-members.php
index 93f7a604..87b7d9b8 100644
--- a/core/um-actions-members.php
+++ b/core/um-actions-members.php
@@ -35,7 +35,7 @@
 				
 					<?php if ( isset( $_REQUEST['page_id'] ) && get_option('permalink_structure') == 0 ) { ?>
 					
-					<input type="hidden" name="page_id" id="page_id" value="<?php echo $_REQUEST['page_id']; ?>" />
+					<input type="hidden" name="page_id" id="page_id" value="<?php echo esc_attr( $_REQUEST['page_id']); ?>" />
 					
 					<?php }
 
diff --git a/core/um-members.php b/core/um-members.php
index e620b3ed..b7971826 100644
--- a/core/um-members.php
+++ b/core/um-members.php
@@ -125,7 +125,7 @@ class UM_Members {
 
 				?>
 
-				<input type="text" name="<?php echo $filter; ?>" id="<?php echo $filter; ?>" placeholder="<?php echo isset( $attrs['label'] ) ? $attrs['label'] : ''; ?>" value="<?php um_queried_search_value( $filter ); ?>" />
+				<input type="text"  name="<?php echo $filter; ?>" id="<?php echo $filter; ?>" placeholder="<?php echo isset( $attrs['label'] ) ? $attrs['label'] : ''; ?>" value='<?php echo esc_attr( um_queried_search_value(  $filter, false ) ); ?>' />
 
 				<?php
 
@@ -140,14 +140,14 @@ class UM_Members {
 	***/
 	function get_members($args){
 
-		global $ultimatemember;
+		global $ultimatemember, $wpdb;
 
 		extract($args);
 
 		$query_args = array();
 		$query_args = apply_filters( 'um_prepare_user_query_args', $query_args, $args );
 		$users = new WP_User_Query( $query_args );
-
+		
 		// number of profiles for mobile
 		if ( $ultimatemember->mobile->isMobile() && isset( $profiles_per_page_mobile ) )
 			$profiles_per_page = $profiles_per_page_mobile;
diff --git a/core/um-short-functions.php b/core/um-short-functions.php
index c82b7e32..d946474f 100644
--- a/core/um-short-functions.php
+++ b/core/um-short-functions.php
@@ -626,15 +626,22 @@ function um_profile_id() {
 	/***
 	***	@Check value of queried search in text input
 	***/
-	function um_queried_search_value( $filter ) {
+	function um_queried_search_value( $filter, $echo = true ) {
 		global $ultimatemember;
+		$value = '';
 		if ( isset($_REQUEST['um_search']) ) {
 			$query = $ultimatemember->permalinks->get_query_array();
-			if ( $query[$filter] != '' ) {
-				echo stripslashes_deep( $query[$filter] );
+			if ( $query[ $filter ] != '' ) {
+				$value = stripslashes_deep( $query[ $filter ] );
 			}
 		}
-		echo '';
+		
+		if( $echo ){
+			echo $value;
+		}else{
+			return $value;
+		}
+
 	}
 
 	/***