Merge pull request #1586 from ultimatemember/development/2.9.x

Version 2.9.1 hotifx
This commit is contained in:
Mykyta Synelnikov
2024-11-15 11:19:21 +02:00
committed by GitHub
+18 -9
View File
@@ -711,16 +711,25 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
$current_user_roles = $this->get_all_user_roles( $user_id ); $current_user_roles = $this->get_all_user_roles( $user_id );
switch( $cap ) { switch ( $cap ) {
case 'edit': case 'edit':
if ( get_current_user_id() === $user_id && ! um_user( 'can_edit_profile' ) ) { if ( get_current_user_id() === $user_id ) {
$return = 0; if ( ! um_user( 'can_edit_profile' ) ) {
} elseif ( ! um_user( 'can_access_private_profile' ) && UM()->user()->is_private_profile( $user_id ) ) { $return = 0;
$return = 0; }
} elseif ( ! um_user( 'can_edit_everyone' ) ) { } else {
$return = 0; // don't merge these `if` conditions!
} elseif ( um_user( 'can_edit_roles' ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, um_user( 'can_edit_roles' ) ) ) <= 0 ) ) { if ( ! um_user( 'can_access_private_profile' ) && UM()->user()->is_private_profile( $user_id ) ) {
$return = 0; $return = 0;
} else {
if ( ! um_user( 'can_edit_everyone' ) ) {
$return = 0;
} else {
if ( um_user( 'can_edit_roles' ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, um_user( 'can_edit_roles' ) ) ) <= 0 ) ) {
$return = 0;
}
}
}
} }
break; break;