Changeset 36695

Timestamp:

02/24/2016 09:42:02 PM (7 years ago)

Author:

jeremyfelt

Message:

Multisite: Provide an "Edit user" link after adding a new user

Props codex-m, jeremyfelt.
Fixes #35705.

Location:

trunk/src/wp-admin

Files:

• network/user-new.php (modified) (2 diffs)
• user-edit.php (modified) (2 diffs)
• user-new.php (modified) (4 diffs)

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

@@ -60 +60 @@
               */
             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;
         }
@@ -68 +68 @@
 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 );
+        }
+    }
 }
 

trunk/src/wp-admin/user-edit.php

@@ -56 +56 @@
 );
 
-$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' );
@@ -180 +180 @@
     <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; ?>

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

@@ -69 +69 @@
         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 );
@@ -148 +148 @@
             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' );
@@ -224 +228 @@
     $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":
@@ -232 +244 @@
                 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":