Wordpress 3.6

[autoinstalls/wordpress.git] / wp-admin / users.php

diff --git a/wp-admin/users.php b/wp-admin/users.php
index 6ea17657c15d4f3fd748cceafb7238c8211c3b5f..e807487a5791a1ef1443301da5ba0f40f99c3432 100644 (file)
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -64,9 +64,9 @@ get_current_screen()->set_help_sidebar(
 );
 
 if ( empty($_REQUEST) ) {
-       $referer = '<input type="hidden" name="wp_http_referer" value="'. esc_attr(stripslashes($_SERVER['REQUEST_URI'])) . '" />';
+       $referer = '<input type="hidden" name="wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
 } elseif ( isset($_REQUEST['wp_http_referer']) ) {
-       $redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), stripslashes($_REQUEST['wp_http_referer']));
+       $redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), wp_unslash( $_REQUEST['wp_http_referer'] ) );
        $referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr($redirect) . '" />';
 } else {
        $redirect = 'users.php';
@@ -86,6 +86,9 @@ jQuery(document).ready( function($) {
        $('input[name=delete_option]').one('change', function() {
                submit.prop('disabled', false);
        });
+       $('#reassign_user').focus( function() {
+               $('#delete_option1').prop('checked', true).trigger('change');
+       });
 });
 </script>
 <?php
@@ -354,7 +357,7 @@ break;
 default:
 
        if ( !empty($_GET['_wp_http_referer']) ) {
-               wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
+               wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
                exit;
        }
 
@@ -378,7 +381,7 @@ default:
                case 'add':
                        if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
                                $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
-                                       esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ),
+                                       esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
                                                self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
                        } else {
                                $messages[] = '<div id="message" class="updated"><p>' . __( 'New user created.' ) . '</p></div>';