WordPress 4.2

[autoinstalls/wordpress.git] / wp-admin / includes / user.php

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 137afcd1483d38216b81b5a40c171eeb90dcd5e3..49062fcbe91775687d2ca294fc1f3b7c3a420942 100644 (file)
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -28,7 +28,7 @@ function add_user() {
  * @return int user id of the updated user
  */
 function edit_user( $user_id = 0 ) {
-       global $wp_roles, $wpdb;
+       global $wp_roles;
        $user = new stdClass;
        if ( $user_id ) {
                $update = true;
@@ -63,7 +63,7 @@ function edit_user( $user_id = 0 ) {
        }
 
        if ( isset( $_POST['email'] ))
-               $user->user_email = sanitize_text_field( $_POST['email'] );
+               $user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
        if ( isset( $_POST['url'] ) ) {
                if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
                        $user->user_url = '';
@@ -195,7 +195,7 @@ function edit_user( $user_id = 0 ) {
  *
  * @since 2.8.0
  *
- * @return unknown
+ * @return array
  */
 function get_editable_roles() {
        global $wp_roles;
@@ -257,7 +257,7 @@ function get_users_drafts( $user_id ) {
 /**
  * Remove user and optionally reassign posts and links to another user.
  *
- * If the $reassign parameter is not assigned to an User ID, then all posts will
+ * If the $reassign parameter is not assigned to a User ID, then all posts will
  * be deleted of that user. The action 'delete_user' that is passed the User ID
  * being deleted will be run after the posts are either reassigned or deleted.
  * The user meta will also be deleted that are for that User ID.
@@ -390,10 +390,11 @@ add_action('admin_init', 'default_password_nag_handler');
  */
 function default_password_nag_handler($errors = false) {
        global $user_ID;
-       if ( ! get_user_option('default_password_nag') ) //Short circuit it.
+       // Short-circuit it.
+       if ( ! get_user_option('default_password_nag') )
                return;
 
-       //get_user_setting = JS saved UI setting. else no-js-fallback code.
+       // get_user_setting = JS saved UI setting. else no-js-fallback code.
        if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
                delete_user_setting('default_password_nag');
                update_user_option($user_ID, 'default_password_nag', false, true);
@@ -401,28 +402,33 @@ function default_password_nag_handler($errors = false) {
 }
 
 add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
+
 /**
  * @since 2.8.0
  */
 function default_password_nag_edit_user($user_ID, $old_data) {
-       if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
+       // Short-circuit it.
+       if ( ! get_user_option('default_password_nag', $user_ID) )
                return;
 
        $new_data = get_userdata($user_ID);
 
-       if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
+       // Remove the nag if the password has been changed.
+       if ( $new_data->user_pass != $old_data->user_pass ) {
                delete_user_setting('default_password_nag');
                update_user_option($user_ID, 'default_password_nag', false, true);
        }
 }
 
 add_action('admin_notices', 'default_password_nag');
+
 /**
  * @since 2.8.0
  */
 function default_password_nag() {
        global $pagenow;
-       if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it.
+       // Short-circuit it.
+       if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
                return;
 
        echo '<div class="error default-password-nag">';