Ticket #16053: 16053.4.diff

wp-admin/includes/class-wp-ms-users-list-table.php

@@ -171 +171 @@
 
                                         case 'username':
                                                 $avatar = get_avatar( $user->user_email, 32 );
-                                                $edit_link = ( get_current_user_id() == $user->ID ) ? 'profile.php' : 'user-edit.php?user_id=' . $user->ID;
+                                                if ( get_current_user_id() == $user->ID ) {
+                                                        $edit_link = esc_url( network_admin_url( 'profile.php' ) );
+                                                } else {
+                                                        $edit_link = esc_url( network_admin_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), 'user-edit.php?user_id=' . $user->ID ) ) );
+                                                }
 
                                                 echo "<td $attributes>"; ?>
-                                                        <?php echo $avatar; ?><strong><a href="<?php echo esc_url( self_admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user->user_login ); ?></a><?php
+                                                        <?php echo $avatar; ?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo stripslashes( $user->user_login ); ?></a><?php
                                                         if ( in_array( $user->user_login, $super_admins ) )
                                                                 echo ' - ' . __( 'Super Admin' );
                                                         ?></strong>
                                                         <br/>
                                                         <?php
                                                                 $actions = array();
-                                                                $actions['edit'] = '<a href="' . esc_url( self_admin_url( $edit_link ) ) . '">' . __( 'Edit' ) . '</a>';
+                                                                $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
 
                                                                 if ( current_user_can( 'delete_user', $user->ID) && ! in_array( $user->user_login, $super_admins ) ) {
                                                                         $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';

wp-admin/user-edit.php

@@ -147 +147 @@
 
 if ( !is_wp_error( $errors ) ) {
         $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true";
-        $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+        if ( $wp_http_referer )
+                $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
         wp_redirect($redirect);
         exit;
 }
@@ -168 +169 @@
 <div id="message" class="updated">
         <p><strong><?php _e('User updated.') ?></strong></p>
         <?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?>
-        <p><a href="users.php"><?php _e('&larr; Back to Authors and Users'); ?></a></p>
+        <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Authors and Users'); ?></a></p>
         <?php endif; ?>
 </div>
 <?php endif; ?>