- member directory header;

- account tabs fields fixes;

assets/css/_um-members.css

@@ -2,15 +2,15 @@
 	- Members overview
 */
 
-.um-members-intro {
-	text-align: center;
-	margin: 0 0 20px 0;
-}
+/*.um-members-intro {*/
+	/*text-align: center;*/
+	/*margin: 0 0 20px 0;*/
+/*}*/
 
-.um-members-total {
-	font-size: 30px;
-	font-weight: 300;
-}
+/*.um-members-total {*/
+	/*font-size: 30px;*/
+	/*font-weight: 300;*/
+/*}*/
 
 
 .um-dropdown li a {

assets/css/um-members.css

@@ -343,6 +343,12 @@ body #content .um-directory a {
     padding: 0;
     position: relative;
     height: 300px; }
+    .um-directory .um-members-wrapper .um-members-intro {
+      text-align: center;
+      margin: 0 0 10px 0; }
+    .um-directory .um-members-wrapper .um-members-total {
+      font-size: 20px;
+      font-weight: 300; }
     .um-directory .um-members-wrapper .um-members {
       width: 100%;
       margin: 0;

assets/js/um-members.js

@@ -220,7 +220,7 @@ function um_ajax_get_members( directory, args ) {
 			//set last data hard for using on layouts reloading
 			um_member_directory_last_data[ hash ] = answer;
 
-			um_build_template( directory, answer.users );
+			um_build_template( directory, answer );
 
 			var pagination_template = wp.template( 'um-members-pagination' );
 			directory.find('.um-members-pagination-box').html( pagination_template( answer ) );
@@ -256,7 +256,12 @@ function um_build_template( directory, data ) {
 	var template = wp.template( 'um-member-' + layout );
 
 	directory.find('.um-members-grid, .um-members-list').remove();
-	directory.find('.um-members-wrapper').prepend( template( data ) );
+	directory.find('.um-members-wrapper').prepend( template( data.users ) );
+
+	var header_template = wp.template( 'um-members-header' );
+	directory.find('.um-members-intro').remove();
+	directory.find('.um-members-wrapper').prepend( header_template( data ) );
+
 	directory.addClass('um-loaded');
 
 	if ( directory.find('.um-members.um-members-grid').length ) {
@@ -547,7 +552,7 @@ jQuery(document).ready( function() {
 			um_set_url_from_data( directory, 'view_type', layout );
 			directory.data( 'view_type', layout );
 
-			um_build_template( directory, data.users );
+			um_build_template( directory, data );
 		}
 		um_members_hide_preloader( directory );
 	});

assets/sass/um-members.sass

@@ -304,6 +304,14 @@ body
     position: relative
     height: 300px
 
+    .um-members-intro
+      text-align: center
+      margin: 0 0 10px 0
+
+    .um-members-total
+      font-size: 20px
+      font-weight: 300
+
     .um-members
       width: 100%
       margin: 0

includes/class-functions.php

@@ -374,5 +374,20 @@ if ( ! class_exists( 'UM_Functions' ) ) {
 
 			return $array;
 		}
+
+
+		/**
+		 * @param $var
+		 *
+		 * @return array|string
+		 */
+		function clean_array( $var ) {
+			if ( is_array( $var ) ) {
+				return array_map( array( $this, 'clean_array' ), $var );
+			} else {
+				return is_scalar( $var ) ? sanitize_text_field( $var ) : $var;
+			}
+		}
+
 	}
 }

includes/class-init.php

@@ -24,7 +24,7 @@ if ( ! class_exists( 'UM' ) ) {
 	 * @method UM_Reviews_API Reviews_API()
 	 * @method UM_Activity_API Activity_API()
 	 * @method UM_Social_Login_API Social_Login_API()
-	 * @method UM_User_Tags_API User_Tags_API()
+	 * @method UM_User_Tags User_Tags()
 	 * @method UM_Verified_Users_API Verified_Users_API()
 	 * @method UM_WooCommerce_API WooCommerce_API()
 	 * @method UM_Terms_Conditions Terms_Conditions()

includes/core/class-account.php

@@ -54,6 +54,8 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 		 * Init AllTabs for user account
 		 *
 		 * @param $args
+		 *
+		 * @throws \Exception
 		 */
 		function init_tabs( $args ) {
 
@@ -84,7 +86,9 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 
 
 		/**
-		 * @return mixed|void
+		 * Get all Account tabs
+		 *
+		 * @return array
 		 */
 		function get_tabs() {
 			$tabs = array();

includes/core/class-member-directory.php

@@ -1729,7 +1729,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 				$pagination_data['header'] = $this->convert_tags( $directory_data['header'], $pagination_data );
 				$pagination_data['header_single'] = $this->convert_tags( $directory_data['header_single'], $pagination_data );
 
-				wp_send_json_success( array( 'users' => array(), 'pagination' => $pagination_data, 'args' => array( 'show_count' => false ) ) );
+				wp_send_json_success( array( 'users' => array(), 'pagination' => $pagination_data ) );
 			}
 
 
@@ -1886,15 +1886,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 			um_reset_user();
 			// end of user card
 
-
-			$data_args = array(
-				'show_count' => false
-			);
-			if ( ! empty( $_POST['search'] ) || ! empty( $_POST['is_filters'] ) || ! empty( $directory_data['search_filters'] ) ) {
-				$data_args['show_count'] = true;
-			}
-
-			wp_send_json_success( array( 'pagination' => $pagination_data, 'users' => $users, 'args' => $data_args ) );
+			wp_send_json_success( array( 'pagination' => $pagination_data, 'users' => $users ) );
 		}
 
 

templates/members-header.php

@@ -4,12 +4,10 @@
 <script type="text/template" id="tmpl-um-members-header">
 	<div class="um-members-intro">
 		<div class="um-members-total">
-			<# if ( data.args.show_count ) { #>
-				<# if ( data.users.length == 1 ) { #>
-					{{{data.pagination.header_single}}}
-				<# } else if ( data.users.length > 1 ) { #>
-					{{{data.pagination.header}}}
-				<# } #>
+			<# if ( data.users.length == 1 ) { #>
+				{{{data.pagination.header_single}}}
+			<# } else if ( data.users.length > 1 ) { #>
+				{{{data.pagination.header}}}
 			<# } #>
 		</div>
 	</div>