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

- fixed transferring restriction content options;

Browse Source 
- fixed user add/edit section for multisite (in processing);
This commit is contained in:
nikitozzzzzzz
2017-11-17 14:14:51 +02:00
parent 13cf985acd
commit 6f5b6205d0
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/packages/2.0-beta1.php
+11 -5
View File
@@ -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,
includes/core/class-user.php
+5 -3
View File
@@ -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' ) { ?>
<h3><?php esc_html_e( 'Ultimate Member', 'ultimate-member' ); ?></h3>
<?php }
@@ -309,7 +309,7 @@ if ( ! class_exists( 'User' ) ) {
$style = '';
$user_role = false;
if ( $userdata !== 'add-new-user' ) {
if ( $userdata !== 'add-new-user' && $userdata !== 'add-existing-user' ) {
// Bail if current user cannot edit users
if ( ! current_user_can( 'edit_user', $userdata->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(); ?>
<div id="um_role_selector_wrapper" <?php echo $style ?>>
<div id="<?php echo $class ?>" <?php echo $style ?>>
<table class="form-table">
<tbody>
<tr>