diff --git a/README.md b/README.md
index c78512ef..d4f28e78 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Ultimate Member is the #1 user profile & membership plugin for WordPress. The pl
| Latest Version |Requires at least|Stable Tag|
| :------------: |:------------:|:------------:|
-| 2.0.10 | WordPress 4.9 or higher| 2.0.10 |
+| 2.0.12 | WordPress 4.9 or higher| 2.0.12 |
Features of the plugin include:
@@ -48,7 +48,7 @@ GNU Version 2 or Any Later Version
Releases
====================
-[Official Release Version: 2.0.10](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.10).
+[Official Release Version: 2.0.12](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.12).
[Official Release Version: 1.3.88](https://github.com/ultimatemember/ultimatemember/releases).
diff --git a/assets/css/um-profile.css b/assets/css/um-profile.css
index 8ee8dd23..1586807e 100644
--- a/assets/css/um-profile.css
+++ b/assets/css/um-profile.css
@@ -549,6 +549,6 @@ font-weight: normal;
@media (min-width: 880px) {
.um-profile-nav-item .um-tip-n {
- display: none;
+ display: none !important;
}
}
\ No newline at end of file
diff --git a/assets/js/um-members.js b/assets/js/um-members.js
index ac80292c..32d44c48 100644
--- a/assets/js/um-members.js
+++ b/assets/js/um-members.js
@@ -4,7 +4,7 @@ jQuery(document).ready(function() {
UM_Member_Grid( jQuery(this) );
});
- jQuery('.um-member-connect').each(function(){
+ jQuery('.um-directory .um-member-connect').each(function(){
if ( jQuery(this).find('a').length == 0 ) {
jQuery(this).remove();
}
diff --git a/assets/js/um-members.min.js b/assets/js/um-members.min.js
index f497cad8..58df4dbf 100644
--- a/assets/js/um-members.min.js
+++ b/assets/js/um-members.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(){jQuery(".um-members").each(function(){UM_Member_Grid(jQuery(this))}),jQuery(".um-member-connect").each(function(){0==jQuery(this).find("a").length&&jQuery(this).remove()}),jQuery(".um-member-meta-main").each(function(){0==jQuery(this).find(".um-member-metaline").length&&0==jQuery(this).find(".um-member-connect").find("a").length&&jQuery(this).remove()}),jQuery(document).on("click",".um-member-more a",function(e){e.preventDefault();var r=jQuery(this).parents(".um-member"),m=jQuery(this).parents(".um-members");return r.find(".um-member-more").hide(),r.find(".um-member-meta").slideDown(function(){UM_Member_Grid(m)}),r.find(".um-member-less").fadeIn(),setTimeout(function(){UM_Member_Grid(m)},100),!1}),jQuery(document).on("click",".um-member-less a",function(e){e.preventDefault();var r=jQuery(this).parents(".um-member"),m=jQuery(this).parents(".um-members");return r.find(".um-member-less").hide(),r.find(".um-member-meta").slideUp(function(){r.find(".um-member-more").fadeIn(),UM_Member_Grid(m)}),!1}),jQuery(document).on("click",".um-do-search",function(e){return e.preventDefault(),jQuery(this).parents("form").find("input").filter(function(e){if(0===this.value.length)return!0}).prop("disabled",!0),jQuery(this).parents("form").find("select").filter(function(e){if(0===this.value.length)return!0}).prop("disabled",!0),jQuery(this).parents("form").submit(),!1})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".um-members").each(function(){UM_Member_Grid(jQuery(this))}),jQuery(".um-directory .um-member-connect").each(function(){0==jQuery(this).find("a").length&&jQuery(this).remove()}),jQuery(".um-member-meta-main").each(function(){0==jQuery(this).find(".um-member-metaline").length&&0==jQuery(this).find(".um-member-connect").find("a").length&&jQuery(this).remove()}),jQuery(document).on("click",".um-member-more a",function(e){e.preventDefault();var r=jQuery(this).parents(".um-member"),m=jQuery(this).parents(".um-members");return r.find(".um-member-more").hide(),r.find(".um-member-meta").slideDown(function(){UM_Member_Grid(m)}),r.find(".um-member-less").fadeIn(),setTimeout(function(){UM_Member_Grid(m)},100),!1}),jQuery(document).on("click",".um-member-less a",function(e){e.preventDefault();var r=jQuery(this).parents(".um-member"),m=jQuery(this).parents(".um-members");return r.find(".um-member-less").hide(),r.find(".um-member-meta").slideUp(function(){r.find(".um-member-more").fadeIn(),UM_Member_Grid(m)}),!1}),jQuery(document).on("click",".um-do-search",function(e){return e.preventDefault(),jQuery(this).parents("form").find("input").filter(function(e){if(0===this.value.length)return!0}).prop("disabled",!0),jQuery(this).parents("form").find("select").filter(function(e){if(0===this.value.length)return!0}).prop("disabled",!0),jQuery(this).parents("form").submit(),!1})});
\ No newline at end of file
diff --git a/includes/admin/core/class-admin-users.php b/includes/admin/core/class-admin-users.php
index e7c2ff9e..fb4b2aa2 100644
--- a/includes/admin/core/class-admin-users.php
+++ b/includes/admin/core/class-admin-users.php
@@ -44,7 +44,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
*/
function user_action_hook( $action ) {
switch ( $action ) {
-
default:
/**
* UM hook
@@ -74,6 +73,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
case 'um_approve_membership':
case 'um_reenable':
+
UM()->user()->approve();
break;
@@ -362,8 +362,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
* Bulk user editing actions
*/
function um_bulk_users_edit() {
- $admin_err = 0;
-
// bulk edit users
if ( ! empty( $_REQUEST['users'] ) && ! empty( $_REQUEST['um_bulkedit'] ) && ! empty( $_REQUEST['um_bulk_action'] ) ) {
@@ -377,66 +375,61 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
foreach ( $users as $user_id ) {
UM()->user()->set( $user_id );
- if ( ! um_user( 'super_admin' ) ) {
- /**
- * UM hook
- *
- * @type action
- * @title um_admin_user_action_hook
- * @description Action on bulk user action
- * @input_vars
- * [{"var":"$bulk_action","type":"string","desc":"Bulk Action"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_admin_user_action_hook{$action}', 'function_name', 10, 1 );
- * @example
- *
- */
- do_action( "um_admin_user_action_hook", $bulk_action );
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_admin_user_action_hook
+ * @description Action on bulk user action
+ * @input_vars
+ * [{"var":"$bulk_action","type":"string","desc":"Bulk Action"}]
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_admin_user_action_hook{$action}', 'function_name', 10, 1 );
+ * @example
+ *
+ */
+ do_action( "um_admin_user_action_hook", $bulk_action );
- /**
- * UM hook
- *
- * @type action
- * @title um_admin_user_action_{$bulk_action}_hook
- * @description Action on bulk user action
- * @change_log
- * ["Since: 2.0"]
- * @usage add_action( 'um_admin_user_action_{$bulk_action}_hook', 'function_name', 10 );
- * @example
- *
- */
- do_action( "um_admin_user_action_{$bulk_action}_hook" );
-
- } else {
- $admin_err = 1;
- }
+ /**
+ * UM hook
+ *
+ * @type action
+ * @title um_admin_user_action_{$bulk_action}_hook
+ * @description Action on bulk user action
+ * @change_log
+ * ["Since: 2.0"]
+ * @usage add_action( 'um_admin_user_action_{$bulk_action}_hook', 'function_name', 10 );
+ * @example
+ *
+ */
+ do_action( "um_admin_user_action_{$bulk_action}_hook" );
}
// Finished. redirect now
- if ( $admin_err == 0 ) {
+ //if ( $admin_err == 0 ) {
- $uri = $this->set_redirect_uri( admin_url( 'users.php' ) );
- $uri = add_query_arg( 'update', 'users_updated', $uri );
+ $uri = $this->set_redirect_uri( admin_url( 'users.php' ) );
+ $uri = add_query_arg( 'update', 'users_updated', $uri );
- wp_redirect( $uri );
+ wp_redirect( $uri );
+ exit;
- exit;
- } else {
+ /*} else {
wp_redirect( admin_url( 'users.php?update=err_users_updated' ) );
exit;
- }
+ }*/
} else if ( ! empty( $_REQUEST['um_bulkedit'] ) ) {
diff --git a/includes/admin/templates/dashboard/cache.php b/includes/admin/templates/dashboard/cache.php
index 2299e8f5..13121cc1 100644
--- a/includes/admin/templates/dashboard/cache.php
+++ b/includes/admin/templates/dashboard/cache.php
@@ -1,11 +1,10 @@
- $v ) {
- if ( strstr( $k, 'um_cache_userdata_' ) !== false ) {
- $count++;
- }
-} ?>
+$count = $wpdb->get_var(
+ "SELECT COUNT( option_id )
+ FROM {$wpdb->options}
+ WHERE option_name LIKE 'um_cache_userdata_%'"
+); ?>
diff --git a/readme.txt b/readme.txt
index 445ec6c6..59d6914e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,7 @@ Donate link:
Tags: community, member, membership, user-profile, user-registration
Requires at least: 4.1
Tested up to: 4.9
-Stable tag: 2.0.10
+Stable tag: 2.0.12
License: GNU Version 2 or Any Later Version
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
@@ -131,6 +131,14 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
= Important: UM2.0+ is a significant update to the code base from 1.3.88. Please make sure you take a full-site backup with restore point before updating the plugin =
+= 2.0.12: April 30, 2018 =
+
+* Bugfixes:
+ - Fixed approving users with "Administrator" role
+ - Fixed problem with URLs for upload images
+ - Fixed not UM roles, which start from "um_" symbols
+ - Fixed content restriction logic
+
= 2.0.11: April 19, 2018 =
* Bugfixes:
diff --git a/ultimate-member.php b/ultimate-member.php
index 5a3cb40a..a083c671 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.0.11
+Version: 2.0.12
Author: Ultimate Member
Author URI: http://ultimatemember.com/
Text Domain: ultimate-member