10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	ultimate-member.php
This commit is contained in:
nikitasinelnikov
2019-08-19 15:16:46 +03:00
parent 68ad3980b0 c71a153afc
commit 26eb9600ca
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-metabox.php
+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;
includes/core/class-access.php
+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;
}
}