Ticket #51379: 51379.4.diff

src/wp-includes/user.php

@@ -1585 +1585 @@
  * Conditional Tags} article in the Theme Developer Handbook.
  *
  * @since 2.0.0
+ * @since 4.9.0 Introduced `username_exists` filter.
  *
- * @param string $username Username.
+ * @param string $username The username to check for existence.
  * @return int|false The user's ID on success, and false on failure.
  */
 function username_exists( $username ) {
@@ -1598 +1599 @@
         }
 
         /**
-         * Filters whether the given username exists or not.
+         * Filters whether the given username exists.
          *
          * @since 4.9.0
          *
-         * @param int|false $user_id  The user's ID on success, and false on failure.
+         * @param int|false $user_id  The user's ID associated to the username, 
+         * or false if the username isn't associated to a user.
          * @param string    $username Username to check.
          */
         return apply_filters( 'username_exists', $user_id, $username );
@@ -1623 +1625 @@
 function email_exists( $email ) {
         $user = get_user_by( 'email', $email );
         if ( $user ) {
-                return $user->ID;
+                $user_id = $user->ID;
+        } else {
+                $user_id = false;
         }
-        return false;
+
+        /**
+         * Filters whether the given email exists.
+         *
+         * @since 5.6.0
+         *
+         * @param int|false $user_id The user's ID on success, and false on failure.
+         * @param string    $email   Email.
+         */
+        return apply_filters( 'email_exists', $user_id, $email );
 }
 
 /**
@@ -1642 +1655 @@
         $valid     = ( $sanitized == $username && ! empty( $sanitized ) );
 
         /**
-         * Filters whether the provided username is valid or not.
+         * Filters whether the provided username is valid.
          *
          * @since 2.0.1
          *
@@ -1833 +1846 @@
 
         /*
          * If there is no update, just check for `email_exists`. If there is an update,
-         * check if current email and new email are the same, or not, and check `email_exists`
+         * check if current email and new email are the same, and check `email_exists`
          * accordingly.
          */
         if ( ( ! $update || ( ! empty( $old_user_data ) && 0 !== strcasecmp( $user_email, $old_user_data->user_email ) ) )