diff --git a/includes/admin/core/packages/2.1.0-beta1/hooks.php b/includes/admin/core/packages/2.1.0-beta1/hooks.php
deleted file mode 100644
index 55f2fe66..00000000
--- a/includes/admin/core/packages/2.1.0-beta1/hooks.php
+++ /dev/null
@@ -1,6 +0,0 @@
- 'metadata210beta1',
- 'memberdir210beta1' => 'memberdir210beta1',
-);
\ No newline at end of file
diff --git a/includes/admin/core/packages/2.1.0-beta1/functions.php b/includes/admin/core/packages/2.1.0/functions.php
similarity index 76%
rename from includes/admin/core/packages/2.1.0-beta1/functions.php
rename to includes/admin/core/packages/2.1.0/functions.php
index 1e396eb8..71339a5b 100644
--- a/includes/admin/core/packages/2.1.0-beta1/functions.php
+++ b/includes/admin/core/packages/2.1.0/functions.php
@@ -1,7 +1,7 @@
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' ) ) );
}
\ No newline at end of file
diff --git a/includes/admin/core/packages/2.1.0/hooks.php b/includes/admin/core/packages/2.1.0/hooks.php
new file mode 100644
index 00000000..eb7974ed
--- /dev/null
+++ b/includes/admin/core/packages/2.1.0/hooks.php
@@ -0,0 +1,6 @@
+ 'metadata210',
+ 'memberdir210' => 'memberdir210',
+);
\ No newline at end of file
diff --git a/includes/admin/core/packages/2.1.0-beta1/init.php b/includes/admin/core/packages/2.1.0/init.php
similarity index 94%
rename from includes/admin/core/packages/2.1.0-beta1/init.php
rename to includes/admin/core/packages/2.1.0/init.php
index 66e34f7d..54419455 100644
--- a/includes/admin/core/packages/2.1.0-beta1/init.php
+++ b/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 ) {
diff --git a/includes/admin/core/packages/2.1.0-beta1/member-directory.php b/includes/admin/core/packages/2.1.0/member-directory.php
similarity index 100%
rename from includes/admin/core/packages/2.1.0-beta1/member-directory.php
rename to includes/admin/core/packages/2.1.0/member-directory.php
diff --git a/includes/admin/core/packages/2.1.0-beta1/metadata.php b/includes/admin/core/packages/2.1.0/metadata.php
similarity index 100%
rename from includes/admin/core/packages/2.1.0-beta1/metadata.php
rename to includes/admin/core/packages/2.1.0/metadata.php
diff --git a/includes/class-dependencies.php b/includes/class-dependencies.php
index c17b880c..8e5149a5 100644
--- a/includes/class-dependencies.php
+++ b/includes/class-dependencies.php
@@ -1,9 +1,10 @@
'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',
);
diff --git a/includes/class-functions.php b/includes/class-functions.php
index c55175bb..57bb8797 100644
--- a/includes/class-functions.php
+++ b/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 ) {
diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index 17011d5f..f613ca11 100644
--- a/includes/core/class-member-directory.php
+++ b/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:
diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po
index 22101d82..376e78a0 100644
--- a/languages/ultimate-member-en_US.po
+++ b/languages/ultimate-member-en_US.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Ultimate Member\n"
-"POT-Creation-Date: 2019-10-01 15:42+0300\n"
-"PO-Revision-Date: 2019-10-01 15:42+0300\n"
+"POT-Creation-Date: 2019-10-04 15:02+0300\n"
+"PO-Revision-Date: 2019-10-04 15:02+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en_US\n"
@@ -3487,19 +3487,19 @@ msgstr ""
msgid "Upgrade user roles..."
msgstr ""
-#: includes/admin/core/packages/2.1.0-alpha4/functions.php:11
+#: includes/admin/core/packages/2.1.0/functions.php:11
msgid "Usermeta was upgraded successfully"
msgstr ""
-#: includes/admin/core/packages/2.1.0-alpha4/functions.php:24
+#: includes/admin/core/packages/2.1.0/functions.php:24
msgid "Member directories were upgraded successfully"
msgstr ""
-#: includes/admin/core/packages/2.1.0-alpha4/init.php:7
+#: includes/admin/core/packages/2.1.0/init.php:7
msgid "Upgrade user metadata..."
msgstr ""
-#: includes/admin/core/packages/2.1.0-alpha4/init.php:33
+#: includes/admin/core/packages/2.1.0/init.php:33
msgid "Upgrade Member Directories..."
msgstr ""
@@ -4528,7 +4528,7 @@ msgid "Register"
msgstr ""
#: includes/class-config.php:135 includes/class-config.php:779
-#: includes/core/class-member-directory.php:1889
+#: includes/core/class-member-directory.php:1893
#: includes/core/um-actions-profile.php:1180
#: includes/core/um-actions-user.php:19
msgid "Logout"
@@ -4654,36 +4654,36 @@ msgid ""
"account data from the site. To delete your account enter your password below"
msgstr ""
-#: includes/class-dependencies.php:181
+#: includes/class-dependencies.php:191
#, php-format
msgid ""
"This version of \"%s\" requires the core %s plugin to be %s or higher."
msgstr ""
-#: includes/class-dependencies.php:183
+#: includes/class-dependencies.php:193
#, php-format
msgid "Please update %s to the latest version."
msgstr ""
-#: includes/class-dependencies.php:185
+#: includes/class-dependencies.php:195
#, php-format
msgid ""
"Sorry, but this version of %s does not work with extension "
"\"%s\" %s version."
msgstr ""
-#: includes/class-dependencies.php:187
+#: includes/class-dependencies.php:197
#, php-format
msgid "Please update extension \"%s\" to the latest version."
msgstr ""
-#: includes/class-dependencies.php:196
+#: includes/class-dependencies.php:206
#, php-format
msgid "Please check \"%s\" %s extension's folder name."
msgstr ""
-#: includes/class-dependencies.php:198
+#: includes/class-dependencies.php:208
#, php-format
msgid "Correct folder name is \"%s\""
msgstr ""
@@ -7077,14 +7077,14 @@ msgstr ""
msgid "Age: {min_range} - {max_range} years old"
msgstr ""
-#: includes/core/class-member-directory.php:1834
-#: includes/core/class-member-directory.php:1878
+#: includes/core/class-member-directory.php:1838
+#: includes/core/class-member-directory.php:1882
#: includes/core/um-actions-profile.php:1147
#: includes/core/um-actions-profile.php:1178
msgid "Edit Profile"
msgstr ""
-#: includes/core/class-member-directory.php:1884
+#: includes/core/class-member-directory.php:1888
#: includes/core/um-actions-profile.php:1179
msgid "My Account"
msgstr ""
diff --git a/readme.txt b/readme.txt
index 9d19b5cf..f48bff2e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -158,7 +158,7 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
- Fixed ajax_resize_image() process
- Fixed country fields values
- Fixed dynamic_profile.php notice
- - Fixed admin_post and admin_post_nopriv submittion
+ - Fixed integration with WP native admin_post and admin_post_nopriv requests
= 2.0.56: August 21, 2019 =
diff --git a/ultimate-member.php b/ultimate-member.php
index fef93f98..1f8fbd2c 100644
--- a/ultimate-member.php
+++ b/ultimate-member.php
@@ -3,7 +3,7 @@
Plugin Name: Ultimate Member
Plugin URI: http://ultimatemember.com/
Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
-Version: 2.1.0-beta1
+Version: 2.1.0
Author: Ultimate Member
Author URI: http://ultimatemember.com/
Text Domain: ultimate-member