Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into beta/2.1.0

# Conflicts:
#	ultimate-member.php
This commit is contained in:
nikitasinelnikov
2019-08-19 15:16:46 +03:00
5 changed files with 23 additions and 7 deletions
+2 -2
View File
@@ -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.55 | WordPress 4.9 or higher| 2.0.55 |
| 2.0.56 | WordPress 4.9 or higher| 2.0.56 |
Features of the plugin include:
@@ -48,7 +48,7 @@ GNU Version 2 or Any Later Version
Releases
====================
[Official Release Version: 2.0.55](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.55).
[Official Release Version: 2.0.56](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.56).
Changelog
====================
+1 -1
View File
@@ -1209,7 +1209,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
* }
* ?>
*/
do_action( "um_admin_field_edit_hook{$attribute}", $this->edit_mode_value );
do_action( "um_admin_field_edit_hook{$attribute}", $this->edit_mode_value, $form_id, $this->edit_array );
break;
+11
View File
@@ -550,6 +550,7 @@ if ( ! class_exists( 'um\core\Access' ) ) {
//exclude from privacy UM default pages (except Members list and User(Profile) page)
if ( ! empty( $post->post_type ) && $post->post_type == 'page' ) {
if ( um_is_core_post( $post, 'login' ) || um_is_core_post( $post, 'register' ) ||
um_is_core_post( $post, 'account' ) || um_is_core_post( $post, 'logout' ) ||
um_is_core_post( $post, 'password-reset' ) || ( is_user_logged_in() && um_is_core_post( $post, 'user' ) ) )
@@ -600,6 +601,16 @@ if ( ! class_exists( 'um\core\Access' ) ) {
return false;
} else {
//set default redirect if Profile page is restricted for not-logged in users
if ( ! is_user_logged_in() && um_is_core_post( $post, 'user' ) && $restriction['_um_accessible'] == '2' ) {
if ( isset( $restriction['_um_access_roles'] ) ) {
$restriction = array( '_um_accessible' => '2', '_um_access_roles' => $restriction['_um_access_roles'], '_um_noaccess_action' => '1', '_um_access_redirect' => '1', '_um_access_redirect_url' => get_home_url( get_current_blog_id() ) );
} else {
$restriction = array( '_um_accessible' => '2', '_um_noaccess_action' => '1', '_um_access_redirect' => '1', '_um_access_redirect_url' => get_home_url( get_current_blog_id() ) );
}
}
return $restriction;
}
}
+2 -2
View File
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Ultimate Member\n"
"POT-Creation-Date: 2019-08-14 11:25+0300\n"
"PO-Revision-Date: 2019-08-14 11:25+0300\n"
"POT-Creation-Date: 2019-08-19 15:11+0300\n"
"PO-Revision-Date: 2019-08-19 15:11+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en_US\n"
+7 -2
View File
@@ -6,7 +6,7 @@ Donate link:
Tags: community, member, membership, user-profile, user-registration
Requires at least: 4.9
Tested up to: 5.2
Stable tag: 2.0.55
Stable tag: 2.0.56
License: GNU Version 2 or Any Later Version
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
@@ -140,7 +140,7 @@ 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.55: August 14, 2019 =
= 2.0.56: August 20, 2019 =
* Enhancements:
- Added security fixes (XSS)
@@ -161,6 +161,11 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
- Fixed generate metakeys for the form's custom fields
- Fixed PHP notices
= 2.0.55: August 16, 2019 =
* Bugfixes:
- Fixed profile privacy for not logged in users, if restriction options set for profile page as visible only for logged in
= 2.0.54: July 22, 2019 =
* Enhancements: