Changeset 44597

Timestamp:

01/15/2019 05:37:48 AM (6 years ago)

Author:

pento

Message:

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

Props subrataemfluence.
See #44315.

File:

• trunk/src/wp-includes/user.php (modified) (3 diffs)

trunk/src/wp-includes/user.php

@@ -1401 +1401 @@
  */
 function username_exists( $username ) {
-    if ( $user = get_user_by( 'login', $username ) ) {
+    $user = get_user_by( 'login', $username );
+    if ( $user ) {
         $user_id = $user->ID;
     } else {
@@ -1431 +1432 @@
  */
 function email_exists( $email ) {
-    if ( $user = get_user_by( 'email', $email ) ) {
+    $user = get_user_by( 'email', $email );
+    if ( $user ) {
         return $user->ID;
     }
@@ -2824 +2826 @@
 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>';
+        }
     }
 }