- 2.1.0 pre-release;

includes/admin/core/packages/2.1.0-beta1/hooks.php

@@ -1,6 +0,0 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit;
-
-return array(
-	'metadata210beta1'     => 'metadata210beta1',
-	'memberdir210beta1'    => 'memberdir210beta1',
-);

includes/admin/core/packages/2.1.0/functions.php

@@ -1,7 +1,7 @@
 <?php if ( ! defined( 'ABSPATH' ) ) exit;
 
 
-function um_upgrade_metadata210beta1() {
+function um_upgrade_metadata210() {
 	UM()->admin()->check_ajax_nonce();
 
 	um_maybe_unset_time_limit();
@@ -12,14 +12,14 @@ function um_upgrade_metadata210beta1() {
 }
 
 
-function um_upgrade_memberdir210beta1() {
+function um_upgrade_memberdir210() {
 	UM()->admin()->check_ajax_nonce();
 
 	um_maybe_unset_time_limit();
 
 	include 'member-directory.php';
 
-	update_option( 'um_last_version_upgrade', '2.1.0-beta1' );
+	update_option( 'um_last_version_upgrade', '2.1.0' );
 
 	wp_send_json_success( array( 'message' => __( 'Member directories were upgraded successfully', 'ultimate-member' ) ) );
 }

includes/admin/core/packages/2.1.0/hooks.php

@@ -0,0 +1,6 @@
+<?php if ( ! defined( 'ABSPATH' ) ) exit;
+
+return array(
+	'metadata210'     => 'metadata210',
+	'memberdir210'    => 'memberdir210',
+);

includes/admin/core/packages/2.1.0/init.php

@@ -11,7 +11,7 @@
 			type: 'POST',
 			dataType: 'json',
 			data: {
-				action: 'um_metadata210beta1',
+				action: 'um_metadata210',
 				nonce: um_admin_scripts.nonce
 			},
 			success: function( response ) {
@@ -36,7 +36,7 @@
 				type: 'POST',
 				dataType: 'json',
 				data: {
-					action: 'um_memberdir210beta1',
+					action: 'um_memberdir210',
 					nonce: um_admin_scripts.nonce
 				},
 				success: function( response ) {

includes/class-dependencies.php

@@ -1,9 +1,10 @@
 <?php
 namespace um;
 
-// Exit if executed directly
+
 if ( ! defined( 'ABSPATH' ) ) exit;
 
+
 /**
  * Ultimate Member Dependency Checker
  *
@@ -32,14 +33,13 @@ if ( ! class_exists( 'um\Dependencies' ) ) {
 		 * @var array
 		 */
 		public $ext_required_version = array(
-			'bbpress'               => '2.0.1',
-			'followers'             => '2.0.1',
-			'friends'               => '2.0.1',
+			'bbpress'               => '2.0.7',
+			'followers'             => '2.1.6',
+			'forumwp'               => '2.0.1',
+			'friends'               => '2.1.4',
 			'groups'                => '2.0',
-			'instagram'             => '2.0',
-			'invitations'           => '2.0',
-			'frontend-posting'      => '1.0',
-			'mailchimp'             => '2.0.1',
+			'instagram'             => '2.0.5',
+			'mailchimp'             => '2.2.0',
 			'messaging'             => '2.0.5',
 			'mycred'                => '2.0',
 			'notices'               => '2.0.1',
@@ -52,20 +52,30 @@ if ( ! class_exists( 'um\Dependencies' ) ) {
 			'social-activity'       => '2.0.6',
 			'social-login'          => '2.0.1',
 			'terms-conditions'      => '2.0',
+			'unsplash'              => '2.0',
+			'user-bookmarks'        => '2.0',
+			'user-photos'           => '2.0.1',
 			'user-tags'             => '2.0',
 			'verified-users'        => '2.0.1',
 			'woocommerce'           => '2.0.1',
+
+			/*????*/
 			'restrict-content'      => '2.0',
-			'beaver-builder'        => '2.0',
-			'user-photos'           => '2.0.1',
-			'user-exporter'         => '1.0.0',
-			'user-events'           => '1.0.0',
-			'filesharing'           => '1.0.0',
+
+			/*rc*/
 			'user-notes'            => '2.0',
-			'user-bookmarks'        => '2.0',
-			'unsplash'              => '2.0',
-			'forumwp'               => '2.0.1',
+			'profile-tabs'          => '1.6',
+
+			/*beta*/
+			'frontend-posting'      => '1.0',
+			/*alpha*/
+			'user-exporter'         => '1.0.0',
+
+			/*in development*/
 			'user-location'         => '1.0',
+			'filesharing'           => '1.0.0',
+			'beaver-builder'        => '2.0',
+			'user-events'           => '1.0.0',
 		);
 
 

includes/class-functions.php

@@ -377,8 +377,9 @@ if ( ! class_exists( 'UM_Functions' ) ) {
 
 
 		/**
-		 * @param $var
+		 * @since 2.1.0
 		 *
+		 * @param $var
 		 * @return array|string
 		 */
 		function clean_array( $var ) {

includes/core/class-member-directory.php

@@ -1533,6 +1533,11 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 		 * @param $directory_data
 		 */
 		function default_filters( $directory_data ) {
+			//unable default filter in case if we select other filters in frontend filters
+			if ( ! empty( $this->custom_filters_in_query ) ) {
+				return;
+			}
+
 			$default_filters = array();
 			if ( ! empty( $directory_data['search_filters'] ) ) {
 				$default_filters = maybe_unserialize( $directory_data['search_filters'] );
@@ -1545,11 +1550,10 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 			}
 
 			foreach ( $default_filters as $field => $value ) {
-
 				//unable default filter in case if we select other value in frontend filters
-				if ( in_array( $field, array_keys( $this->custom_filters_in_query ) ) ) {
-					continue;
-				}
+//				if ( in_array( $field, array_keys( $this->custom_filters_in_query ) ) ) {
+//					continue;
+//				}
 
 				switch ( $field ) {
 					default: