diff --git a/includes/admin/core/packages/2.0-beta1.php b/includes/admin/core/packages/2.0-beta1.php index 655b5d0e..866b4490 100644 --- a/includes/admin/core/packages/2.0-beta1.php +++ b/includes/admin/core/packages/2.0-beta1.php @@ -1014,7 +1014,12 @@ if ( ! empty( $um_roles ) ) { update_option( 'um_roles', $role_keys ); - +global $wp_roles, $wp_version; +if ( version_compare( $wp_version, '4.9.0', '<' ) && method_exists( $wp_roles, '_init' ) ) { + wp_roles()->_init(); +} elseif ( method_exists( $wp_roles, 'for_site' ) ) { + wp_roles()->for_site( get_current_blog_id() ); +} //Content Restriction transfer $roles_array = UM()->roles()->get_roles( false, array( 'administrator' ) ); @@ -1035,17 +1040,18 @@ if ( ! empty( $posts ) ) { $access_roles = array(); if ( ! empty( $um_access_roles ) ) { - foreach ( $roles_array as $role ) { + foreach ( $roles_array as $role => $role_label ) { if ( in_array( substr( $role, 3 ), $um_access_roles ) ) - $access_roles[$role] = '1'; + $access_roles[ $role ] = '1'; else - $access_roles[$role] = '0'; + $access_roles[ $role ] = '0'; } } else { foreach ( $roles_array as $role ) { - $access_roles[$role] = '0'; + $access_roles[ $role ] = '0'; } } + $restrict_options = array( '_um_custom_access_settings' => '1', '_um_accessible' => $um_accessible, diff --git a/includes/core/class-user.php b/includes/core/class-user.php index fbcf1ce8..70a7be10 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -269,7 +269,7 @@ if ( ! class_exists( 'User' ) ) { if ( ! empty( $section_content ) ) { - if ( $userdata !== 'add-new-user' ) { ?> + if ( $userdata !== 'add-new-user' && $userdata !== 'add-existing-user' ) { ?>

ID ) ) return $content; @@ -320,9 +320,11 @@ if ( ! class_exists( 'User' ) ) { } + $class = ( $userdata == 'add-existing-user' ) ? 'um_role_existing_selector_wrapper' : 'um_role_selector_wrapper'; + ob_start(); ?> -
> +
>