diff --git a/wp-admin/menu.php b/wp-admin/menu.php index 81bc034942..78b410e7a7 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -130,10 +130,7 @@ else if ( current_user_can('edit_users') ) { $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php. $submenu['users.php'][5] = array(__('Authors & Users'), 'edit_users', 'users.php'); - if ( !is_multisite() ) - $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php'); - elseif ( is_super_admin() || get_site_option( 'add_new_users' ) ) - $submenu['users.php'][10] = array(__('Add New') . ' *', 'create_users', 'ms-options.php#addnewusers'); + $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php'); $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php'); } else { diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 1f2db707d2..8b6d701b0e 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -62,10 +62,10 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { $redirect = 'user-new.php'; $username = $user_details->user_login; $user_id = $user_details->ID; - if ( ($username != null && is_site_admin( $username ) == false ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) { + if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) { $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' ); } else { - if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) { + if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) ); $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' ); } else { @@ -184,12 +184,16 @@ foreach ( array('user_login' => 'login', 'first_name' => 'firstname', 'last_name $new_user_send_password = !$_POST || isset($_POST['send_password']); ?>
+ | + | ||
---|---|---|---|
@@ -198,15 +202,10 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']); | |||
- | - | ||
@@ -223,16 +222,7 @@ $new_user_send_password = !$_POST || isset($_POST['send_password']); | |||
- | - | ||
- | - | ||
- | + |