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

- fixed small notices about array_intersect;

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-02-19 12:10:54 +02:00
parent f4d1251220
commit 1b03923c6b
7 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+1 -1
View File
@@ -1172,7 +1172,7 @@ if ( ! class_exists( 'Fields' ) ) {
um_fetch_user( $_um_profile_id );
if ( isset( $data['public'] ) && $data['public'] == '-2' && $data['roles'] ) {
$current_user_roles = um_user( 'roles' );
if ( count( array_intersect( $current_user_roles, $data['roles'] ) ) > 0 ) {
if ( ! empty( $current_user_roles ) && count( array_intersect( $current_user_roles, $data['roles'] ) ) > 0 ) {
$disabled = '';
}
}
includes/core/class-roles-capabilities.php
+2 -2
View File
@@ -440,14 +440,14 @@ if ( ! class_exists( 'Roles_Capabilities' ) ) {
$return = 0;
elseif ( get_current_user_id() == $user_id && ! um_user( 'can_edit_profile') )
$return = 0;
elseif ( um_user( 'can_edit_roles' ) && count( array_intersect( $current_user_roles, um_user( 'can_edit_roles' ) ) ) <= 0 )
elseif ( um_user( 'can_edit_roles' ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, um_user( 'can_edit_roles' ) ) ) <= 0 ) )
$return = 0;
break;
case 'delete':
if ( ! um_user( 'can_delete_everyone' ) )
$return = 0;
elseif ( um_user( 'can_delete_roles' ) && count( array_intersect( $current_user_roles, um_user( 'can_delete_roles' ) ) ) <= 0 )
elseif ( um_user( 'can_delete_roles' ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, um_user( 'can_delete_roles' ) ) ) <= 0 ) )
$return = 0;
break;
includes/core/class-shortcodes.php
+2 -2
View File
@@ -671,13 +671,13 @@ if ( ! class_exists( 'Shortcodes' ) ) {
if ( ! empty( $a['not'] ) ) {
$not_in_roles = explode( ",", $a['not'] );
if ( is_array( $not_in_roles ) && count( array_intersect( $current_user_roles, $not_in_roles ) ) <= 0 ) {
if ( is_array( $not_in_roles ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $not_in_roles ) ) <= 0 ) ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
}
} else {
$roles = explode( ",", $a['roles'] );
if ( is_array( $roles ) && count( array_intersect( $current_user_roles, $roles ) ) > 0 ) {
if ( ! empty( $current_user_roles ) && is_array( $roles ) && count( array_intersect( $current_user_roles, $roles ) ) > 0 ) {
return do_shortcode( $this->convert_locker_tags( $content ) );
}
}
includes/core/um-actions-form.php
+1 -1
View File
@@ -143,7 +143,7 @@ if ( ! defined( 'ABSPATH' ) ) exit;
if ( isset( $array['public'] ) && -2 == $array['public'] && ! empty( $array['roles'] ) && is_user_logged_in() ) {
$current_user_roles = um_user( 'roles' );
if ( count( array_intersect( $current_user_roles, $array['roles'] ) ) <= 0 ) {
if ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $array['roles'] ) ) <= 0 ) {
continue;
}
}
includes/core/um-actions-members.php
+1 -1
View File
@@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) exit;
if ( $args['search'] == 1 && is_array( $search_filters ) ) { // search on
$current_user_roles = um_user( 'roles' );
if ( ! empty( $args['roles_can_search'] ) && count( array_intersect( $current_user_roles, $args['roles_can_search'] ) ) <= 0 ) {
if ( ! empty( $args['roles_can_search'] ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $args['roles_can_search'] ) ) <= 0 ) ) {
return;
}
includes/core/um-filters-navmenu.php
+3
View File
@@ -58,6 +58,9 @@ if ( ! is_admin() ) {
case 2:
if ( is_user_logged_in() && ! empty( $roles ) ) {
$current_user_roles = um_user( 'roles' );
if ( empty( $current_user_roles ) ) {
return false;
}
$visible = ( count( array_intersect( $current_user_roles, (array)$roles ) ) > 0 ) ? true : false;
} else {
$visible = is_user_logged_in() ? true : false;
includes/um-short-functions.php
+2 -2
View File
@@ -1009,14 +1009,14 @@ function um_can_view_field( $data ) {
if ( is_user_logged_in() ) {
$current_user_roles = um_user( 'roles' );
if ( $data['public'] == '-3' && ! um_is_user_himself() && count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 )
if ( $data['public'] == '-3' && ! um_is_user_himself() && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 ) )
return false;
if ( ! um_is_user_himself() && $data['public'] == '-1' && ! UM()->roles()->um_user_can( 'can_edit_everyone' ) )
return false;
if ( $data['public'] == '-2' && $data['roles'] )
if ( count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 )
if ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 )
return false;
}