Ticket #35705: 35705.4.diff

src/wp-admin/network/user-new.php

@@ -59 +59 @@
                           * @param int $user_id ID of the newly created user.
                           */
                         do_action( 'network_user_new_created_user', $user_id );
-                        wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
+                        wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
                         exit;
                 }
         }
@@ -67 +67 @@
 
 if ( isset($_GET['update']) ) {
         $messages = array();
-        if ( 'added' == $_GET['update'] )
-                $messages[] = __('User added.');
+        if ( 'added' == $_GET['update'] ) {
+                $edit_link = '';
+                if ( isset( $_GET['user_id'] ) ) {
+                        $user_id_new = absint( $_GET['user_id'] );
+                        if ( $user_id_new ) {
+                                $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) );
+                        }
+                }
+
+                if ( empty( $edit_link ) ) {
+                        $messages[] = __( 'User added.' );
+                } else {
+                        $messages[] = sprintf( __( 'User added. <a href="%1$s">Edit User</a>' ), $edit_link );
+                }
+        }
 }
 
 $title = __('Add New User');

src/wp-admin/user-edit.php

@@ -55 +55 @@
     '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
-$wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_referer );
+$wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );
 
 $user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
 
@@ -179 +179 @@
         <?php else: ?>
         <p><strong><?php _e('User updated.') ?></strong></p>
         <?php endif; ?>
-        <?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?>
+        <?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
         <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
         <?php endif; ?>
 </div>

src/wp-admin/user-new.php

@@ -68 +68 @@
         } else {
                 if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
                         add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
-                        $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+                        $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' );
                 } else {
                         $newuser_key = substr( md5( $user_id ), 0, 5 );
                         add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
@@ -147 +147 @@
                         wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) );
                         if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
                                 $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
-                                wpmu_activate_signup( $key );
-                                $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+                                $new_user = wpmu_activate_signup( $key );
+                                if ( ! is_wp_error( $new_user ) ) {
+                                        $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' );
+                                } else {
+                                        $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' );
+                                }
                         } else {
                                 $redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' );
                         }
@@ -223 +227 @@
 if ( isset($_GET['update']) ) {
         $messages = array();
         if ( is_multisite() ) {
+                $edit_link = '';
+                if ( ( isset( $_GET['user_id'] ) ) ) {
+                        $user_id_new = absint( $_GET['user_id'] );
+                        if ( $user_id_new ) {
+                                $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) );
+                        }
+                }
+
                 switch ( $_GET['update'] ) {
                         case "newuserconfirmation":
                                 $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.');
@@ -231 +243 @@
                                 $messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.');
                                 break;
                         case "addnoconfirmation":
-                                $messages[] = __('User has been added to your site.');
+                                if ( empty( $edit_link ) ) {
+                                        $messages[] = __( 'User has been added to your site.' );
+                                } else {
+                                        $messages[] = sprintf( __( 'User has been added to your site. <a href="%1$s">Edit User</a>' ), $edit_link );
+                                }
                                 break;
                         case "addexisting":
                                 $messages[] = __('That user is already a member of this site.');