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

- multisite users creation fixes;

Browse Source
This commit is contained in:
nikitozzzzzzz
2017-11-26 13:16:43 +02:00
parent fe004f41a5
commit 6bdb6af868
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-role-wrapper.js
+9
View File
@@ -9,4 +9,13 @@ jQuery( document ).ready( function() {
}
}).trigger('change');
jQuery( '#adduser-role' ).change( function() {
if ( jQuery.inArray( jQuery(this).val().substr(3), um_roles ) !== -1 ) {
jQuery( '#um_role_existing_selector_wrapper' ).hide();
jQuery( '#um-role' ).val('');
} else {
jQuery( '#um_role_existing_selector_wrapper' ).show();
}
}).trigger('change');
});
includes/core/class-user.php
+46 -1
View File
@@ -66,9 +66,54 @@ if ( ! class_exists( 'User' ) ) {
add_action( 'user_register', array( &$this, 'user_register_via_admin' ), 10, 1 );
add_action( 'user_register', array( &$this, 'set_gravatar' ), 11, 1 );
add_action( 'added_existing_user', array( &$this, 'add_um_role_existing_user' ), 10, 2 );
add_action( 'wpmu_activate_user', array( &$this, 'add_um_role_wpmu_new_user' ), 10, 1 );
}
/**
* Multisite add existing user
*
* @param $user_id
* @param $result
*/
function add_um_role_existing_user( $user_id, $result ) {
// Bail if no user ID was passed
if ( empty( $user_id ) )
return;
if ( ! empty( $_POST['um-role'] ) ) {
if ( ! user_can( $user_id, $_POST['um-role'] ) ) {
UM()->roles()->set_role( $user_id, $_POST['um-role'] );
}
}
$this->remove_cache( $user_id );
}
/**
* Multisite add existing user
*
* @param $user_id
*/
function add_um_role_wpmu_new_user( $user_id ) {
// Bail if no user ID was passed
if ( empty( $user_id ) )
return;
if ( ! empty( $_POST['um-role'] ) ) {
if ( ! user_can( $user_id, $_POST['um-role'] ) ) {
UM()->roles()->set_role( $user_id, $_POST['um-role'] );
}
}
$this->remove_cache( $user_id );
}
/**
* Get pending users (in queue)
*/
@@ -267,7 +312,7 @@ if ( ! class_exists( 'User' ) ) {
$section_content = apply_filters( 'um_user_profile_additional_fields', '', $userdata );
if ( ! empty( $section_content ) ) {
if ( ! empty( $section_content ) && ! ( is_multisite() && is_network_admin() ) ) {
if ( $userdata !== 'add-new-user' && $userdata !== 'add-existing-user' ) { ?>
<h3><?php esc_html_e( 'Ultimate Member', 'ultimate-member' ); ?></h3>