WordPress 4.6.1

[autoinstalls/wordpress.git] / wp-includes / pluggable.php

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 88d1440599cd1af83069d0e0cc8a8966d97f47ec..5c7747774b2d6e519bd2ad07bf445b67b49c438f 100644 (file)
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -54,81 +54,19 @@ if ( !function_exists('wp_get_current_user') ) :
 /**
  * Retrieve the current user object.
  *
 /**
  * Retrieve the current user object.
  *

- * @since 2.0.3
- *
- * @global WP_User $current_user
- *
- * @return WP_User Current user WP_User object
- */
-function wp_get_current_user() {
-       global $current_user;
-
-       get_currentuserinfo();
-
-       return $current_user;
-}
-endif;
-
-if ( !function_exists('get_currentuserinfo') ) :
-/**
- * Populate global variables with information about the currently logged in user.
- *

  * Will set the current user, if the current user is not set. The current user
  * will be set to the logged-in person. If no user is logged-in, then it will
  * set the current user to 0, which is invalid and won't have any permissions.
  *
  * Will set the current user, if the current user is not set. The current user
  * will be set to the logged-in person. If no user is logged-in, then it will
  * set the current user to 0, which is invalid and won't have any permissions.
  *

- * @since 0.71
+ * @since 2.0.3

  *
  *

- * @global WP_User $current_user Checks if the current user is set
+ * @see _wp_get_current_user()
+ * @global WP_User $current_user Checks if the current user is set.

  *
  *

- * @return false|void False on XML-RPC Request and invalid auth cookie.
+ * @return WP_User Current WP_User instance.

  */
  */

-function get_currentuserinfo() {
-       global $current_user;
-
-       if ( ! empty( $current_user ) ) {
-               if ( $current_user instanceof WP_User )
-                       return;
-
-               // Upgrade stdClass to WP_User
-               if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
-                       $cur_id = $current_user->ID;
-                       $current_user = null;
-                       wp_set_current_user( $cur_id );
-                       return;
-               }
-
-               // $current_user has a junk value. Force to WP_User with ID 0.
-               $current_user = null;
-               wp_set_current_user( 0 );
-               return false;
-       }
-
-       if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-               wp_set_current_user( 0 );
-               return false;
-       }
-
-       /**
-        * Filter the current user.
-        *
-        * The default filters use this to determine the current user from the
-        * request's cookies, if available.
-        *
-        * Returning a value of false will effectively short-circuit setting
-        * the current user.
-        *
-        * @since 3.9.0
-        *
-        * @param int|bool $user_id User ID if one has been determined, false otherwise.
-        */
-       $user_id = apply_filters( 'determine_current_user', false );
-       if ( ! $user_id ) {
-               wp_set_current_user( 0 );
-               return false;
-       }
-
-       wp_set_current_user( $user_id );
+function wp_get_current_user() {
+       return _wp_get_current_user();

 }
 endif;
 
 }
 endif;
 


@@ -216,10 +154,10 @@ if ( !function_exists( 'wp_mail' ) ) :
  *
  * The default content type is 'text/plain' which does not allow using HTML.
  * However, you can set the content type of the email by using the
  *
  * The default content type is 'text/plain' which does not allow using HTML.
  * However, you can set the content type of the email by using the

- * 'wp_mail_content_type' filter.
+ * {@see 'wp_mail_content_type'} filter.

  *
  * The default charset is based on the charset used on the blog. The charset can
  *
  * The default charset is based on the charset used on the blog. The charset can

- * be set using the 'wp_mail_charset' filter.
+ * be set using the {@see 'wp_mail_charset'} filter.

  *
  * @since 1.2.1
  *
  *
  * @since 1.2.1
  *


@@ -236,7 +174,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
        // Compact the input, apply the filters, and extract them back out
 
        /**
        // Compact the input, apply the filters, and extract them back out
 
        /**

-        * Filter the wp_mail() arguments.
+        * Filters the wp_mail() arguments.

         *
         * @since 2.2.0
         *
         *
         * @since 2.2.0
         *


@@ -278,6 +216,8 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
        }
 
        // Headers
        }
 
        // Headers

+       $cc = $bcc = $reply_to = array();
+

        if ( empty( $headers ) ) {
                $headers = array();
        } else {
        if ( empty( $headers ) ) {
                $headers = array();
        } else {


@@ -289,8 +229,6 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                        $tempheaders = $headers;
                }
                $headers = array();
                        $tempheaders = $headers;
                }
                $headers = array();

-               $cc = array();
-               $bcc = array();

 
                // If it's actually got contents
                if ( !empty( $tempheaders ) ) {
 
                // If it's actually got contents
                if ( !empty( $tempheaders ) ) {


@@ -353,6 +291,9 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                                        case 'bcc':
                                                $bcc = array_merge( (array) $bcc, explode( ',', $content ) );
                                                break;
                                        case 'bcc':
                                                $bcc = array_merge( (array) $bcc, explode( ',', $content ) );
                                                break;

+                                       case 'reply-to':
+                                               $reply_to = array_merge( (array) $reply_to, explode( ',', $content ) );
+                                               break;

                                        default:
                                                // Add it to our grand headers array
                                                $headers[trim( $name )] = trim( $content );
                                        default:
                                                // Add it to our grand headers array
                                                $headers[trim( $name )] = trim( $content );


@@ -391,78 +332,67 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
        }
 
        /**
        }
 
        /**

-        * Filter the email address to send from.
+        * Filters the email address to send from.

         *
         * @since 2.2.0
         *
         * @param string $from_email Email address to send from.
         */
         *
         * @since 2.2.0
         *
         * @param string $from_email Email address to send from.
         */

-       $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
+       $from_email = apply_filters( 'wp_mail_from', $from_email );

 
        /**
 
        /**

-        * Filter the name to associate with the "from" email address.
+        * Filters the name to associate with the "from" email address.

         *
         * @since 2.3.0
         *
         * @param string $from_name Name associated with the "from" email address.
         */
         *
         * @since 2.3.0
         *
         * @param string $from_name Name associated with the "from" email address.
         */

-       $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
+       $from_name = apply_filters( 'wp_mail_from_name', $from_name );
+
+       $phpmailer->setFrom( $from_email, $from_name, false );

 
        // Set destination addresses
        if ( !is_array( $to ) )
                $to = explode( ',', $to );
 
 
        // Set destination addresses
        if ( !is_array( $to ) )
                $to = explode( ',', $to );
 

-       foreach ( (array) $to as $recipient ) {
-               try {
-                       // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
-                       $recipient_name = '';
-                       if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
-                               if ( count( $matches ) == 3 ) {
-                                       $recipient_name = $matches[1];
-                                       $recipient = $matches[2];
-                               }
-                       }
-                       $phpmailer->AddAddress( $recipient, $recipient_name);
-               } catch ( phpmailerException $e ) {
-                       continue;
-               }
-       }
-

        // Set mail's subject and body
        $phpmailer->Subject = $subject;
        $phpmailer->Body    = $message;
 
        // Set mail's subject and body
        $phpmailer->Subject = $subject;
        $phpmailer->Body    = $message;
 

-       // Add any CC and BCC recipients
-       if ( !empty( $cc ) ) {
-               foreach ( (array) $cc as $recipient ) {
-                       try {
-                               // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
-                               $recipient_name = '';
-                               if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
-                                       if ( count( $matches ) == 3 ) {
-                                               $recipient_name = $matches[1];
-                                               $recipient = $matches[2];
-                                       }
-                               }
-                               $phpmailer->AddCc( $recipient, $recipient_name );
-                       } catch ( phpmailerException $e ) {
-                               continue;
-                       }
+       // Use appropriate methods for handling addresses, rather than treating them as generic headers
+       $address_headers = compact( 'to', 'cc', 'bcc', 'reply_to' );
+
+       foreach ( $address_headers as $address_header => $addresses ) {
+               if ( empty( $addresses ) ) {
+                       continue;

                }
                }

-       }

 
 

-       if ( !empty( $bcc ) ) {
-               foreach ( (array) $bcc as $recipient) {
+               foreach ( (array) $addresses as $address ) {

                        try {
                                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
                                $recipient_name = '';
                        try {
                                // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
                                $recipient_name = '';

-                               if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
+
+                               if ( preg_match( '/(.*)<(.+)>/', $address, $matches ) ) {

                                        if ( count( $matches ) == 3 ) {
                                                $recipient_name = $matches[1];
                                        if ( count( $matches ) == 3 ) {
                                                $recipient_name = $matches[1];

-                                               $recipient = $matches[2];
+                                               $address        = $matches[2];

                                        }
                                }
                                        }
                                }

-                               $phpmailer->AddBcc( $recipient, $recipient_name );
+
+                               switch ( $address_header ) {
+                                       case 'to':
+                                               $phpmailer->addAddress( $address, $recipient_name );
+                                               break;
+                                       case 'cc':
+                                               $phpmailer->addCc( $address, $recipient_name );
+                                               break;
+                                       case 'bcc':
+                                               $phpmailer->addBcc( $address, $recipient_name );
+                                               break;
+                                       case 'reply_to':
+                                               $phpmailer->addReplyTo( $address, $recipient_name );
+                                               break;
+                               }

                        } catch ( phpmailerException $e ) {
                                continue;
                        }
                        } catch ( phpmailerException $e ) {
                                continue;
                        }


@@ -478,7 +408,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                $content_type = 'text/plain';
 
        /**
                $content_type = 'text/plain';
 
        /**

-        * Filter the wp_mail() content type.
+        * Filters the wp_mail() content type.

         *
         * @since 2.3.0
         *
         *
         * @since 2.3.0
         *


@@ -499,7 +429,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
        // Set the content-type and charset
 
        /**
        // Set the content-type and charset
 
        /**

-        * Filter the default wp_mail() charset.
+        * Filters the default wp_mail() charset.

         *
         * @since 2.3.0
         *
         *
         * @since 2.3.0
         *


@@ -541,7 +471,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
                return $phpmailer->Send();
        } catch ( phpmailerException $e ) {
 
                return $phpmailer->Send();
        } catch ( phpmailerException $e ) {
 

-               $mail_error_data = compact( $to, $subject, $message, $headers, $attachments );
+               $mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );

 
                /**
                 * Fires after a phpmailerException is caught.
 
                /**
                 * Fires after a phpmailerException is caught.


@@ -560,36 +490,40 @@ endif;
 
 if ( !function_exists('wp_authenticate') ) :
 /**
 
 if ( !function_exists('wp_authenticate') ) :
 /**

- * Checks a user's login information and logs them in if it checks out.
+ * Authenticate a user, confirming the login credentials are valid.

  *
  * @since 2.5.0
  *
  * @since 2.5.0

+ * @since 4.5.0 `$username` now accepts an email address.

  *
  *

- * @param string $username User's username
- * @param string $password User's password
- * @return WP_User|WP_Error WP_User object if login successful, otherwise WP_Error object.
+ * @param string $username User's username or email address.
+ * @param string $password User's password.
+ * @return WP_User|WP_Error WP_User object if the credentials are valid,
+ *                          otherwise WP_Error.

  */
 function wp_authenticate($username, $password) {
        $username = sanitize_user($username);
        $password = trim($password);
 
        /**
  */
 function wp_authenticate($username, $password) {
        $username = sanitize_user($username);
        $password = trim($password);
 
        /**

-        * Filter the user to authenticate.
+        * Filters whether a set of user login credentials are valid.

         *
         *

-        * If a non-null value is passed, the filter will effectively short-circuit
-        * authentication, returning an error instead.
+        * A WP_User object is returned if the credentials authenticate a user.
+        * WP_Error or null otherwise.

         *
         * @since 2.8.0
         *
         * @since 2.8.0

+        * @since 4.5.0 `$username` now accepts an email address.

         *
         *

-        * @param null|WP_User $user     User to authenticate.
-        * @param string       $username User login.
-        * @param string       $password User password
+        * @param null|WP_User|WP_Error $user     WP_User if the user is authenticated.
+        *                                        WP_Error or null otherwise.
+        * @param string                $username Username or email address.
+        * @param string                $password User password

         */
        $user = apply_filters( 'authenticate', null, $username, $password );
 
        if ( $user == null ) {
                // TODO what should the error message be? (Or would these even happen?)
                // Only needed if all authentication handlers fail to return anything.
         */
        $user = apply_filters( 'authenticate', null, $username, $password );
 
        if ( $user == null ) {
                // TODO what should the error message be? (Or would these even happen?)
                // Only needed if all authentication handlers fail to return anything.

-               $user = new WP_Error('authentication_failed', __('<strong>ERROR</strong>: Invalid username or incorrect password.'));
+               $user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );

        }
 
        $ignore_codes = array('empty_username', 'empty_password');
        }
 
        $ignore_codes = array('empty_username', 'empty_password');


@@ -599,8 +533,9 @@ function wp_authenticate($username, $password) {
                 * Fires after a user login has failed.
                 *
                 * @since 2.5.0
                 * Fires after a user login has failed.
                 *
                 * @since 2.5.0

+                * @since 4.5.0 The value of `$username` can now be an email address.

                 *
                 *

-                * @param string $username User login.
+                * @param string $username Username or email address.

                 */
                do_action( 'wp_login_failed', $username );
        }
                 */
                do_action( 'wp_login_failed', $username );
        }


@@ -667,7 +602,7 @@ function wp_validate_auth_cookie($cookie = '', $scheme = '') {
        $token = $cookie_elements['token'];
        $expired = $expiration = $cookie_elements['expiration'];
 
        $token = $cookie_elements['token'];
        $expired = $expiration = $cookie_elements['expiration'];
 

-       // Allow a grace period for POST and AJAX requests
+       // Allow a grace period for POST and Ajax requests

        if ( defined('DOING_AJAX') || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
                $expired += HOUR_IN_SECONDS;
        }
        if ( defined('DOING_AJAX') || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
                $expired += HOUR_IN_SECONDS;
        }


@@ -724,7 +659,7 @@ function wp_validate_auth_cookie($cookie = '', $scheme = '') {
                return false;
        }
 
                return false;
        }
 

-       // AJAX/POST grace period set above
+       // Ajax/POST grace period set above

        if ( $expiration < time() ) {
                $GLOBALS['login_grace_period'] = 1;
        }
        if ( $expiration < time() ) {
                $GLOBALS['login_grace_period'] = 1;
        }


@@ -750,7 +685,7 @@ if ( !function_exists('wp_generate_auth_cookie') ) :
  * @since 2.5.0
  *
  * @param int    $user_id    User ID
  * @since 2.5.0
  *
  * @param int    $user_id    User ID

- * @param int    $expiration Cookie expiration in seconds
+ * @param int    $expiration The time the cookie expires as a UNIX timestamp.

  * @param string $scheme     Optional. The cookie scheme to use: auth, secure_auth, or logged_in
  * @param string $token      User's session token to use for this cookie
  * @return string Authentication cookie contents. Empty string if user does not exist.
  * @param string $scheme     Optional. The cookie scheme to use: auth, secure_auth, or logged_in
  * @param string $token      User's session token to use for this cookie
  * @return string Authentication cookie contents. Empty string if user does not exist.


@@ -777,13 +712,13 @@ function wp_generate_auth_cookie( $user_id, $expiration, $scheme = 'auth', $toke
        $cookie = $user->user_login . '|' . $expiration . '|' . $token . '|' . $hash;
 
        /**
        $cookie = $user->user_login . '|' . $expiration . '|' . $token . '|' . $hash;
 
        /**

-        * Filter the authentication cookie.
+        * Filters the authentication cookie.

         *
         * @since 2.5.0
         *
         * @param string $cookie     Authentication cookie.
         * @param int    $user_id    User ID.
         *
         * @since 2.5.0
         *
         * @param string $cookie     Authentication cookie.
         * @param int    $user_id    User ID.

-        * @param int    $expiration Authentication cookie expiration in seconds.
+        * @param int    $expiration The time the cookie expires as a UNIX timestamp.

         * @param string $scheme     Cookie scheme used. Accepts 'auth', 'secure_auth', or 'logged_in'.
         * @param string $token      User's session token used.
         */
         * @param string $scheme     Cookie scheme used. Accepts 'auth', 'secure_auth', or 'logged_in'.
         * @param string $token      User's session token used.
         */


@@ -841,7 +776,7 @@ endif;
 
 if ( !function_exists('wp_set_auth_cookie') ) :
 /**
 
 if ( !function_exists('wp_set_auth_cookie') ) :
 /**

- * Sets the authentication cookies based on user ID.
+ * Log in a user by setting authentication cookies.

  *
  * The $remember parameter increases the time that the cookie will be kept. The
  * default the cookie is kept without remembering is two days. When $remember is
  *
  * The $remember parameter increases the time that the cookie will be kept. The
  * default the cookie is kept without remembering is two days. When $remember is


@@ -859,7 +794,7 @@ if ( !function_exists('wp_set_auth_cookie') ) :
 function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
        if ( $remember ) {
                /**
 function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
        if ( $remember ) {
                /**

-                * Filter the duration of the authentication cookie expiration period.
+                * Filters the duration of the authentication cookie expiration period.

                 *
                 * @since 2.8.0
                 *
                 *
                 * @since 2.8.0
                 *


@@ -884,11 +819,11 @@ function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token =
                $secure = is_ssl();
        }
 
                $secure = is_ssl();
        }
 

-       // Frontend cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
+       // Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.

        $secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME );
 
        /**
        $secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME );
 
        /**

-        * Filter whether the connection is secure.
+        * Filters whether the connection is secure.

         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *


@@ -898,7 +833,7 @@ function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token =
        $secure = apply_filters( 'secure_auth_cookie', $secure, $user_id );
 
        /**
        $secure = apply_filters( 'secure_auth_cookie', $secure, $user_id );
 
        /**

-        * Filter whether to use a secure cookie when logged-in.
+        * Filters whether to use a secure cookie when logged-in.

         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *


@@ -930,23 +865,25 @@ function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token =
         * @since 2.5.0
         *
         * @param string $auth_cookie Authentication cookie.
         * @since 2.5.0
         *
         * @param string $auth_cookie Authentication cookie.

-        * @param int    $expire      Login grace period in seconds. Default 43,200 seconds, or 12 hours.
-        * @param int    $expiration  Duration in seconds the authentication cookie should be valid.
-        *                            Default 1,209,600 seconds, or 14 days.
+        * @param int    $expire      The time the login grace period expires as a UNIX timestamp.
+        *                            Default is 12 hours past the cookie's expiration time.
+        * @param int    $expiration  The time when the authentication cookie expires as a UNIX timestamp.
+        *                            Default is 14 days from now.

         * @param int    $user_id     User ID.
         * @param string $scheme      Authentication scheme. Values include 'auth', 'secure_auth', or 'logged_in'.
         */
        do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme );
 
        /**
         * @param int    $user_id     User ID.
         * @param string $scheme      Authentication scheme. Values include 'auth', 'secure_auth', or 'logged_in'.
         */
        do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme );
 
        /**

-        * Fires immediately before the secure authentication cookie is set.
+        * Fires immediately before the logged-in authentication cookie is set.

         *
         * @since 2.6.0
         *
         * @param string $logged_in_cookie The logged-in cookie.
         *
         * @since 2.6.0
         *
         * @param string $logged_in_cookie The logged-in cookie.

-        * @param int    $expire           Login grace period in seconds. Default 43,200 seconds, or 12 hours.
-        * @param int    $expiration       Duration in seconds the authentication cookie should be valid.
-        *                                 Default 1,209,600 seconds, or 14 days.
+        * @param int    $expire           The time the login grace period expires as a UNIX timestamp.
+        *                                 Default is 12 hours past the cookie's expiration time.
+        * @param int    $expiration       The time when the logged-in authentication cookie expires as a UNIX timestamp.
+        *                                 Default is 14 days from now.

         * @param int    $user_id          User ID.
         * @param string $scheme           Authentication scheme. Default 'logged_in'.
         */
         * @param int    $user_id          User ID.
         * @param string $scheme           Authentication scheme. Default 'logged_in'.
         */


@@ -1022,7 +959,7 @@ function auth_redirect() {
        $secure = ( is_ssl() || force_ssl_admin() );
 
        /**
        $secure = ( is_ssl() || force_ssl_admin() );
 
        /**

-        * Filter whether to use a secure authentication redirect.
+        * Filters whether to use a secure authentication redirect.

         *
         * @since 3.1.0
         *
         *
         * @since 3.1.0
         *


@@ -1041,18 +978,14 @@ function auth_redirect() {
                }
        }
 
                }
        }
 

-       if ( is_user_admin() ) {
-               $scheme = 'logged_in';
-       } else {
-               /**
-                * Filter the authentication redirect scheme.
-                *
-                * @since 2.9.0
-                *
-                * @param string $scheme Authentication redirect scheme. Default empty.
-                */
-               $scheme = apply_filters( 'auth_redirect_scheme', '' );
-       }
+       /**
+        * Filters the authentication redirect scheme.
+        *
+        * @since 2.9.0
+        *
+        * @param string $scheme Authentication redirect scheme. Default empty.
+        */
+       $scheme = apply_filters( 'auth_redirect_scheme', '' );

 
        if ( $user_id = wp_validate_auth_cookie( '',  $scheme) ) {
                /**
 
        if ( $user_id = wp_validate_auth_cookie( '',  $scheme) ) {
                /**


@@ -1106,7 +1039,7 @@ if ( !function_exists('check_admin_referer') ) :
  */
 function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
        if ( -1 == $action )
  */
 function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
        if ( -1 == $action )

-               _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' );
+               _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );

 
        $adminurl = strtolower(admin_url());
        $referer = strtolower(wp_get_referer());
 
        $adminurl = strtolower(admin_url());
        $referer = strtolower(wp_get_referer());


@@ -1134,7 +1067,7 @@ endif;
 
 if ( !function_exists('check_ajax_referer') ) :
 /**
 
 if ( !function_exists('check_ajax_referer') ) :
 /**

- * Verifies the AJAX request to prevent processing requests external of the blog.
+ * Verifies the Ajax request to prevent processing requests external of the blog.

  *
  * @since 2.0.3
  *
  *
  * @since 2.0.3
  *


@@ -1160,11 +1093,11 @@ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
        $result = wp_verify_nonce( $nonce, $action );
 
        /**
        $result = wp_verify_nonce( $nonce, $action );
 
        /**

-        * Fires once the AJAX request has been validated or not.
+        * Fires once the Ajax request has been validated or not.

         *
         * @since 2.1.0
         *
         *
         * @since 2.1.0
         *

-        * @param string    $action The AJAX nonce action.
+        * @param string    $action The Ajax nonce action.

         * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
         *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
         */
         * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
         *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
         */


@@ -1186,6 +1119,19 @@ if ( !function_exists('wp_redirect') ) :
 /**
  * Redirects to another page.
  *
 /**
  * Redirects to another page.
  *

+ * Note: wp_redirect() does not exit automatically, and should almost always be
+ * followed by a call to `exit;`:
+ *
+ *     wp_redirect( $url );
+ *     exit;
+ *
+ * Exiting can also be selectively manipulated by using wp_redirect() as a conditional
+ * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} hooks:
+ *
+ *     if ( wp_redirect( $url ) {
+ *         exit;
+ *     }
+ *

  * @since 1.5.1
  *
  * @global bool $is_IIS
  * @since 1.5.1
  *
  * @global bool $is_IIS


@@ -1198,7 +1144,7 @@ function wp_redirect($location, $status = 302) {
        global $is_IIS;
 
        /**
        global $is_IIS;
 
        /**

-        * Filter the redirect location.
+        * Filters the redirect location.

         *
         * @since 2.1.0
         *
         *
         * @since 2.1.0
         *


@@ -1208,7 +1154,7 @@ function wp_redirect($location, $status = 302) {
        $location = apply_filters( 'wp_redirect', $location, $status );
 
        /**
        $location = apply_filters( 'wp_redirect', $location, $status );
 
        /**

-        * Filter the redirect status code.
+        * Filters the redirect status code.

         *
         * @since 2.3.0
         *
         *
         * @since 2.3.0
         *


@@ -1237,7 +1183,8 @@ if ( !function_exists('wp_sanitize_redirect') ) :
  *
  * @since 2.3.0
  *
  *
  * @since 2.3.0
  *

- * @return string redirect-sanitized URL
+ * @param string $location The path to redirect to.
+ * @return string Redirect-sanitized URL.

  **/
 function wp_sanitize_redirect($location) {
        $regex = '/
  **/
 function wp_sanitize_redirect($location) {
        $regex = '/


@@ -1269,6 +1216,9 @@ function wp_sanitize_redirect($location) {
  * @access private
  *
  * @see wp_sanitize_redirect()
  * @access private
  *
  * @see wp_sanitize_redirect()

+ *
+ * @param array $matches RegEx matches against the redirect location.
+ * @return string URL-encoded version of the first RegEx match.

  */
 function _wp_sanitize_utf8_in_redirect( $matches ) {
        return urlencode( $matches[0] );
  */
 function _wp_sanitize_utf8_in_redirect( $matches ) {
        return urlencode( $matches[0] );


@@ -1288,6 +1238,9 @@ if ( !function_exists('wp_safe_redirect') ) :
  * but only used in a few places.
  *
  * @since 2.3.0
  * but only used in a few places.
  *
  * @since 2.3.0

+ *
+ * @param string $location The path to redirect to.
+ * @param int    $status   Status code to use.

  */
 function wp_safe_redirect($location, $status = 302) {
 
  */
 function wp_safe_redirect($location, $status = 302) {
 


@@ -1295,7 +1248,7 @@ function wp_safe_redirect($location, $status = 302) {
        $location = wp_sanitize_redirect($location);
 
        /**
        $location = wp_sanitize_redirect($location);
 
        /**

-        * Filter the redirect fallback URL for when the provided redirect is not safe (local).
+        * Filters the redirect fallback URL for when the provided redirect is not safe (local).

         *
         * @since 4.3.0
         *
         *
         * @since 4.3.0
         *


@@ -1333,7 +1286,8 @@ function wp_validate_redirect($location, $default = '') {
        // In php 5 parse_url may fail if the URL query part contains http://, bug #38143
        $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
 
        // In php 5 parse_url may fail if the URL query part contains http://, bug #38143
        $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
 

-       $lp  = parse_url($test);
+       // @-operator is used to prevent possible warnings in PHP < 5.3.3.
+       $lp = @parse_url($test);

 
        // Give up if malformed URL
        if ( false === $lp )
 
        // Give up if malformed URL
        if ( false === $lp )


@@ -1343,14 +1297,22 @@ function wp_validate_redirect($location, $default = '') {
        if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
                return $default;
 
        if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
                return $default;
 

-       // Reject if scheme is set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
-       if ( isset($lp['scheme'])  && !isset($lp['host']) )
+       // Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
+       if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {

                return $default;
                return $default;

+       }
+
+       // Reject malformed components parse_url() can return on odd inputs.
+       foreach ( array( 'user', 'pass', 'host' ) as $component ) {
+               if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
+                       return $default;
+               }
+       }

 
        $wpp = parse_url(home_url());
 
        /**
 
        $wpp = parse_url(home_url());
 
        /**

-        * Filter the whitelist of hosts to redirect to.
+        * Filters the whitelist of hosts to redirect to.

         *
         * @since 2.3.0
         *
         *
         * @since 2.3.0
         *


@@ -1378,7 +1340,7 @@ if ( ! function_exists('wp_notify_postauthor') ) :
  */
 function wp_notify_postauthor( $comment_id, $deprecated = null ) {
        if ( null !== $deprecated ) {
  */
 function wp_notify_postauthor( $comment_id, $deprecated = null ) {
        if ( null !== $deprecated ) {

-               _deprecated_argument( __FUNCTION__, '3.8' );
+               _deprecated_argument( __FUNCTION__, '3.8.0' );

        }
 
        $comment = get_comment( $comment_id );
        }
 
        $comment = get_comment( $comment_id );


@@ -1395,7 +1357,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
        }
 
        /**
        }
 
        /**

-        * Filter the list of email addresses to receive a comment notification.
+        * Filters the list of email addresses to receive a comment notification.

         *
         * By default, only post authors are notified of comments. This filter allows
         * others to be added.
         *
         * By default, only post authors are notified of comments. This filter allows
         * others to be added.


@@ -1417,7 +1379,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
        $emails = array_flip( $emails );
 
        /**
        $emails = array_flip( $emails );
 
        /**

-        * Filter whether to notify comment authors of their comments on their own posts.
+        * Filters whether to notify comment authors of their comments on their own posts.

         *
         * By default, comment authors aren't notified of their comments on their own
         * posts. This filter allows you to override that.
         *
         * By default, comment authors aren't notified of their comments on their own
         * posts. This filter allows you to override that.


@@ -1497,11 +1459,11 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
 
        if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
                if ( EMPTY_TRASH_DAYS ) {
 
        if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
                if ( EMPTY_TRASH_DAYS ) {

-                       $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment->comment_ID}") ) . "\r\n";
+                       $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";

                } else {
                } else {

-                       $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c={$comment->comment_ID}") ) . "\r\n";
+                       $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";

                }
                }

-               $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c={$comment->comment_ID}") ) . "\r\n";
+               $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";

        }
 
        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
        }
 
        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));


@@ -1523,7 +1485,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
                $message_headers .= $reply_to . "\n";
 
        /**
                $message_headers .= $reply_to . "\n";
 
        /**

-        * Filter the comment notification email text.
+        * Filters the comment notification email text.

         *
         * @since 1.5.2
         *
         *
         * @since 1.5.2
         *


@@ -1533,7 +1495,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
        $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID );
 
        /**
        $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID );
 
        /**

-        * Filter the comment notification email subject.
+        * Filters the comment notification email subject.

         *
         * @since 1.5.2
         *
         *
         * @since 1.5.2
         *


@@ -1543,7 +1505,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
        $subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID );
 
        /**
        $subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID );
 
        /**

-        * Filter the comment notification email headers.
+        * Filters the comment notification email headers.

         *
         * @since 1.5.2
         *
         *
         * @since 1.5.2
         *


@@ -1580,7 +1542,7 @@ function wp_notify_moderator($comment_id) {
        $maybe_notify = get_option( 'moderation_notify' );
 
        /**
        $maybe_notify = get_option( 'moderation_notify' );
 
        /**

-        * Filter whether to send the site moderator email notifications, overriding the site setting.
+        * Filters whether to send the site moderator email notifications, overriding the site setting.

         *
         * @since 4.4.0
         *
         *
         * @since 4.4.0
         *


@@ -1638,22 +1600,24 @@ function wp_notify_moderator($comment_id) {
                        break;
        }
 
                        break;
        }
 

-       $notify_message .= sprintf( __('Approve it: %s'),  admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n";
+       $notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+

        if ( EMPTY_TRASH_DAYS )
        if ( EMPTY_TRASH_DAYS )

-               $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+               $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";

        else
        else

-               $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-       $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+               $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+
+       $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";

 
        $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
                'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
 
        $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
                'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";

-       $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
+       $notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n";

 
        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
        $message_headers = '';
 
        /**
 
        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
        $message_headers = '';
 
        /**

-        * Filter the list of recipients for comment moderation emails.
+        * Filters the list of recipients for comment moderation emails.

         *
         * @since 3.7.0
         *
         *
         * @since 3.7.0
         *


@@ -1663,7 +1627,7 @@ function wp_notify_moderator($comment_id) {
        $emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
 
        /**
        $emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
 
        /**

-        * Filter the comment moderation email text.
+        * Filters the comment moderation email text.

         *
         * @since 1.5.2
         *
         *
         * @since 1.5.2
         *


@@ -1673,7 +1637,7 @@ function wp_notify_moderator($comment_id) {
        $notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
 
        /**
        $notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
 
        /**

-        * Filter the comment moderation email subject.
+        * Filters the comment moderation email subject.

         *
         * @since 1.5.2
         *
         *
         * @since 1.5.2
         *


@@ -1683,7 +1647,7 @@ function wp_notify_moderator($comment_id) {
        $subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
 
        /**
        $subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
 
        /**

-        * Filter the comment moderation email headers.
+        * Filters the comment moderation email headers.

         *
         * @since 2.8.0
         *
         *
         * @since 2.8.0
         *


@@ -1712,11 +1676,13 @@ function wp_password_change_notification( $user ) {
        // send a copy of password change notification to the admin
        // but check to see if it's the admin whose password we're changing, and skip this
        if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
        // send a copy of password change notification to the admin
        // but check to see if it's the admin whose password we're changing, and skip this
        if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {

-               $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
+               /* translators: %s: user name */
+               $message = sprintf( __( 'Password changed for user: %s' ), $user->user_login ) . "\r\n";

                // The blogname option is escaped with esc_html on the way into the database in sanitize_option
                // we want to reverse this for the plain text arena of emails.
                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
                // The blogname option is escaped with esc_html on the way into the database in sanitize_option
                // we want to reverse this for the plain text arena of emails.
                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);

-               wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message);
+               /* translators: %s: site title */
+               wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] Password Changed' ), $blogname ), $message );

        }
 }
 endif;
        }
 }
 endif;


@@ -1730,6 +1696,7 @@ if ( !function_exists('wp_new_user_notification') ) :
  * @since 2.0.0
  * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
  * @since 4.3.1 The `$plaintext_pass` parameter was deprecated. `$notify` added as a third parameter.
  * @since 2.0.0
  * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
  * @since 4.3.1 The `$plaintext_pass` parameter was deprecated. `$notify` added as a third parameter.

+ * @since 4.6.0 The `$notify` parameter accepts 'user' for sending notification only to the user created.

  *
  * @global wpdb         $wpdb      WordPress database object for queries.
  * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.
  *
  * @global wpdb         $wpdb      WordPress database object for queries.
  * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.


@@ -1737,7 +1704,7 @@ if ( !function_exists('wp_new_user_notification') ) :
  * @param int    $user_id    User ID.
  * @param null   $deprecated Not used (argument deprecated).
  * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
  * @param int    $user_id    User ID.
  * @param null   $deprecated Not used (argument deprecated).
  * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty

- *                           string (admin only), or 'both' (admin and user). Default empty.
+ *                           string (admin only), 'user', or 'both' (admin and user). Default empty.

  */
 function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
        if ( $deprecated !== null ) {
  */
 function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
        if ( $deprecated !== null ) {


@@ -1751,11 +1718,13 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
        // we want to reverse this for the plain text arena of emails.
        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
        // we want to reverse this for the plain text arena of emails.
        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 

-       $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
-       $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
-       $message .= sprintf(__('Email: %s'), $user->user_email) . "\r\n";
+       if ( 'user' !== $notify ) {
+               $message  = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
+               $message .= sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
+               $message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n";

 
 

-       @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
+               @wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] New User Registration' ), $blogname ), $message );
+       }

 
        // `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notifcation.
        if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {
 
        // `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notifcation.
        if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {


@@ -1799,7 +1768,7 @@ if ( !function_exists('wp_nonce_tick') ) :
  */
 function wp_nonce_tick() {
        /**
  */
 function wp_nonce_tick() {
        /**

-        * Filter the lifespan of nonces in seconds.
+        * Filters the lifespan of nonces in seconds.

         *
         * @since 2.5.0
         *
         *
         * @since 2.5.0
         *


@@ -1831,7 +1800,7 @@ function wp_verify_nonce( $nonce, $action = -1 ) {
        $uid = (int) $user->ID;
        if ( ! $uid ) {
                /**
        $uid = (int) $user->ID;
        if ( ! $uid ) {
                /**

-                * Filter whether the user who generated the nonce is logged out.
+                * Filters whether the user who generated the nonce is logged out.

                 *
                 * @since 3.5.0
                 *
                 *
                 * @since 3.5.0
                 *


@@ -1943,7 +1912,7 @@ function wp_salt( $scheme = 'auth' ) {
        static $cached_salts = array();
        if ( isset( $cached_salts[ $scheme ] ) ) {
                /**
        static $cached_salts = array();
        if ( isset( $cached_salts[ $scheme ] ) ) {
                /**

-                * Filter the WordPress salt.
+                * Filters the WordPress salt.

                 *
                 * @since 2.5.0
                 *
                 *
                 * @since 2.5.0
                 *


@@ -2016,7 +1985,8 @@ if ( !function_exists('wp_hash') ) :
  *
  * @since 2.0.3
  *
  *
  * @since 2.0.3
  *

- * @param string $data Plain text to hash
+ * @param string $data   Plain text to hash
+ * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce)

  * @return string Hash of $data
  */
 function wp_hash($data, $scheme = 'auth') {
  * @return string Hash of $data
  */
 function wp_hash($data, $scheme = 'auth') {


@@ -2071,8 +2041,9 @@ if ( !function_exists('wp_check_password') ) :
  *     against the $hash + $password
  * @uses PasswordHash::CheckPassword
  *
  *     against the $hash + $password
  * @uses PasswordHash::CheckPassword
  *

- * @param string $password Plaintext user's password
- * @param string $hash     Hash of the user's password to check against.
+ * @param string     $password Plaintext user's password
+ * @param string     $hash     Hash of the user's password to check against.
+ * @param string|int $user_id  Optional. User ID.

  * @return bool False, if the $password does not match the hashed password
  */
 function wp_check_password($password, $hash, $user_id = '') {
  * @return bool False, if the $password does not match the hashed password
  */
 function wp_check_password($password, $hash, $user_id = '') {


@@ -2088,14 +2059,14 @@ function wp_check_password($password, $hash, $user_id = '') {
                }
 
                /**
                }
 
                /**

-                * Filter whether the plaintext password matches the encrypted password.
+                * Filters whether the plaintext password matches the encrypted password.

                 *
                 * @since 2.5.0
                 *
                 *
                 * @since 2.5.0
                 *

-                * @param bool   $check    Whether the passwords match.
-                * @param string $password The plaintext password.
-                * @param string $hash     The hashed password.
-                * @param int    $user_id  User ID.
+                * @param bool       $check    Whether the passwords match.
+                * @param string     $password The plaintext password.
+                * @param string     $hash     The hashed password.
+                * @param string|int $user_id  User ID. Can be empty.

                 */
                return apply_filters( 'check_password', $check, $password, $hash, $user_id );
        }
                 */
                return apply_filters( 'check_password', $check, $password, $hash, $user_id );
        }


@@ -2141,7 +2112,7 @@ function wp_generate_password( $length = 12, $special_chars = true, $extra_speci
        }
 
        /**
        }
 
        /**

-        * Filter the randomly-generated password.
+        * Filters the randomly-generated password.

         *
         * @since 3.0.0
         *
         *
         * @since 3.0.0
         *


@@ -2181,7 +2152,7 @@ function wp_rand( $min = 0, $max = 0 ) {
        if ( $use_random_int_functionality ) {
                try {
                        $_max = ( 0 != $max ) ? $max : $max_random_number;
        if ( $use_random_int_functionality ) {
                try {
                        $_max = ( 0 != $max ) ? $max : $max_random_number;

-                       // wp_rand() can accept arguements in either order, PHP cannot.
+                       // wp_rand() can accept arguments in either order, PHP cannot.

                        $_max = max( $min, $_max );
                        $_min = min( $min, $_max );
                        $val = random_int( $_min, $_max );
                        $_max = max( $min, $_max );
                        $_min = min( $min, $_max );
                        $val = random_int( $_min, $_max );


@@ -2330,10 +2301,10 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
        }
 
        /**
        }
 
        /**

-        * Filter whether to retrieve the avatar URL early.
+        * Filters whether to retrieve the avatar URL early.

         *
         * Passing a non-null value will effectively short-circuit get_avatar(), passing
         *
         * Passing a non-null value will effectively short-circuit get_avatar(), passing

-        * the value through the {@see 'pre_get_avatar'} filter and returning early.
+        * the value through the {@see 'get_avatar'} filter and returning early.

         *
         * @since 4.2.0
         *
         *
         * @since 4.2.0
         *


@@ -2389,7 +2360,7 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
        );
 
        /**
        );
 
        /**

-        * Filter the avatar to retrieve.
+        * Filters the avatar to retrieve.

         *
         * @since 2.5.0
         * @since 4.2.0 The `$args` parameter was added.
         *
         * @since 2.5.0
         * @since 4.2.0 The `$args` parameter was added.