Ticket #11271: 11271.diff

wp-admin/includes/template.php

@@ -1913 +1913 @@
                 if ($current_user->ID == $user_object->ID) {
                         $edit_link = 'profile.php';
                 } else {
-                        $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( esc_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) );
+                        $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( esc_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_to_edit=$user_object->ID" ) );
                 }
                 $edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
 

wp-admin/user-edit.php

@@ -22 +22 @@
         $submenu_file = 'profile.php';
 $parent_file = 'users.php';
 
-wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer'));
+wp_reset_vars(array('action', 'redirect', 'profile', 'user_to_edit', 'wp_http_referer'));
 
 $wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer));
 
-$user_id = (int) $user_id;
+$user_to_edit = (int) $user_to_edit;
 
-if ( !$user_id ) {
+if ( !$user_to_edit ) {
         if ( IS_PROFILE_PAGE ) {
                 $current_user = wp_get_current_user();
-                $user_id = $current_user->ID;
+                $user_to_edit = $current_user->ID;
         } else {
                 wp_die(__('Invalid user ID.'));
         }
-} elseif ( !get_userdata($user_id) ) {
+} elseif ( !get_userdata($user_to_edit) ) {
         wp_die( __('Invalid user ID.') );
 }
 
@@ -71 +71 @@
 
 case 'update':
 
-check_admin_referer('update-user_' . $user_id);
+check_admin_referer('update-user_' . $user_to_edit);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_to_edit) )
         wp_die(__('You do not have permission to edit this user.'));
 
 if ( IS_PROFILE_PAGE )
-        do_action('personal_options_update', $user_id);
+        do_action('personal_options_update', $user_to_edit);
 else
-        do_action('edit_user_profile_update', $user_id);
+        do_action('edit_user_profile_update', $user_to_edit);
 
-$errors = edit_user($user_id);
+$errors = edit_user($user_to_edit);
 
 if ( !is_wp_error( $errors ) ) {
-        $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true";
+        $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_to_edit=$user_to_edit&"). "updated=true";
         $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
         wp_redirect($redirect);
         exit;
 }
 
 default:
-$profileuser = get_user_to_edit($user_id);
+$profileuser = get_user_to_edit($user_to_edit);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_to_edit) )
         wp_die(__('You do not have permission to edit this user.'));
 
 include ('admin-header.php');
@@ -123 +123 @@
 <h2><?php echo esc_html( $title ); ?></h2>
 
 <form id="your-profile" action="<?php if ( IS_PROFILE_PAGE ) { echo admin_url('profile.php'); } else { echo admin_url('user-edit.php'); } ?>" method="post">
-<?php wp_nonce_field('update-user_' . $user_id) ?>
+<?php wp_nonce_field('update-user_' . $user_to_edit) ?>
 <?php if ( $wp_http_referer ) : ?>
         <input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
 <?php endif; ?>
 <p>
 <input type="hidden" name="from" value="profile" />
-<input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />
+<input type="hidden" name="checkuser_id" value="<?php echo $user_to_edit ?>" />
 </p>
 
 <h3><?php _e('Personal Options'); ?></h3>
@@ -146 +146 @@
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Admin Color Scheme')?></span></legend>
 <?php
-$current_color = get_user_option('admin_color', $user_id);
+$current_color = get_user_option('admin_color', $user_to_edit);
 if ( empty($current_color) )
         $current_color = 'fresh';
 foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
@@ -333 +333 @@
 
 <p class="submit">
         <input type="hidden" name="action" value="update" />
-        <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
+        <input type="hidden" name="user_to_edit" id="user_to_edit" value="<?php echo esc_attr($user_to_edit); ?>" />
         <input type="submit" class="button-primary" value="<?php IS_PROFILE_PAGE ? esc_attr_e('Update Profile') : esc_attr_e('Update User') ?>" name="submit" />
 </p>
 </form>