WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coding Standards: Move assignments out of conditions in `wp-includes/user.php`. 

Props subrataemfluence.
See #44315.


Built from https://develop.svn.wordpress.org/trunk@44597


git-svn-id: http://core.svn.wordpress.org/trunk@44428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2019-01-15 05:38:49 +00:00
parent db696999f1
commit 120710d8f8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/user.php
View File

@ -1400,7 +1400,8 @@ function clean_user_cache( $user ) {
* @return int|false The user's ID on success, and false on failure.
*/
function username_exists( $username ) {
if ( $user = get_user_by( 'login', $username ) ) {
$user = get_user_by( 'login', $username );
if ( $user ) {
$user_id = $user->ID;
} else {
$user_id = false;
@ -1430,7 +1431,8 @@ function username_exists( $username ) {
* @return int|false The user's ID on success, and false on failure.
*/
function email_exists( $email ) {
if ( $user = get_user_by( 'email', $email ) ) {
$user = get_user_by( 'email', $email );
if ( $user ) {
return $user->ID;
}
return false;
@ -2823,9 +2825,13 @@ All at ###SITENAME###
*/
function new_user_email_admin_notice() {
global $pagenow;
if ( 'profile.php' === $pagenow && isset( $_GET['updated'] ) && $email = get_user_meta( get_current_user_id(), '_new_email', true ) ) {
/* translators: %s: New email address */
echo '<div class="notice notice-info"><p>' . sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), '<code>' . esc_html( $email['newemail'] ) . '</code>' ) . '</p></div>';
if ( 'profile.php' === $pagenow && isset( $_GET['updated'] ) ) {
$email = get_user_meta( get_current_user_id(), '_new_email', true );
if ( $email ) {
/* translators: %s: New email address */
echo '<div class="notice notice-info"><p>' . sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), '<code>' . esc_html( $email['newemail'] ) . '</code>' ) . '</p></div>';
}
}
}

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.1-beta1-44596';
$wp_version = '5.1-beta1-44597';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.