diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index b17b0f72c..4eff50eac 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -98,12 +98,10 @@ Please click the following link to confirm the invite: if ( is_wp_error( $user_id ) ) { $add_user_errors = $user_id; } else { - if ( current_user_can('edit_users') ) { - $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true)); - $redirect = 'users.php?usersearch='. urlencode($new_user_login) . '&update=add' . '#user-' . $user_id; - } else { + if ( current_user_can( 'list_users' ) ) + $redirect = 'users.php?update=add&id=' . $user_id; + else $redirect = add_query_arg( 'update', 'add', 'user-new.php' ); - } wp_redirect( $redirect ); die(); } diff --git a/wp-admin/users.php b/wp-admin/users.php index 593b9907f..cbd808e0a 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -353,10 +353,16 @@ default: case 'del': case 'del_many': $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; - $messages[] = '

' . sprintf(_n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '

'; + $messages[] = '

' . sprintf( _n( 'User deleted.', '%s users deleted.', $delete_count ), number_format_i18n( $delete_count ) ) . '

'; break; case 'add': - $messages[] = '

' . __('New user created.') . '

'; + if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) { + $messages[] = '

' . sprintf( __( 'New user created. Edit user' ), + esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), + self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '

'; + } else { + $messages[] = '

' . __( 'New user created.' ) . '

'; + } break; case 'promote': $messages[] = '

' . __('Changed roles.') . '

';