diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php index a0553421d5..4f1ad275b6 100644 --- a/wp-includes/ms-deprecated.php +++ b/wp-includes/ms-deprecated.php @@ -334,18 +334,18 @@ function wpmu_admin_redirect_add_updated_param( $url = '' ) { * @deprecated 3.6.0 Use get_user_by() * @see get_user_by() * - * @param string $string Either an email address or a login. + * @param string $email_or_login Either an email address or a login. * @return int */ -function get_user_id_from_string( $string ) { +function get_user_id_from_string( $email_or_login ) { _deprecated_function( __FUNCTION__, '3.6.0', 'get_user_by()' ); - if ( is_email( $string ) ) - $user = get_user_by( 'email', $string ); - elseif ( is_numeric( $string ) ) - return $string; + if ( is_email( $email_or_login ) ) + $user = get_user_by( 'email', $email_or_login ); + elseif ( is_numeric( $email_or_login ) ) + return $email_or_login; else - $user = get_user_by( 'login', $string ); + $user = get_user_by( 'login', $email_or_login ); if ( $user ) return $user->ID; diff --git a/wp-includes/version.php b/wp-includes/version.php index caf623664e..b4fdb4865b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54945'; +$wp_version = '6.2-alpha-54946'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.