From 63f8e4d122d8b9c988b21527b3a9d671dbc4b491 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 29 Nov 2017 15:27:55 +0000 Subject: [PATCH] Users: After [42256], remove unnecessary double quotes around `first_name` and `last_name` properties. See #42713. git-svn-id: https://develop.svn.wordpress.org/trunk@42257 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-ms-users-list-table.php | 8 ++++---- src/wp-admin/includes/class-wp-users-list-table.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wp-admin/includes/class-wp-ms-users-list-table.php b/src/wp-admin/includes/class-wp-ms-users-list-table.php index 0a3adaaad1..42cea7eb6f 100644 --- a/src/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-users-list-table.php @@ -266,10 +266,10 @@ class WP_MS_Users_List_Table extends WP_List_Table { public function column_name( $user ) { if ( $user->first_name && $user->last_name ) { echo "$user->first_name $user->last_name"; - } else if ( ! empty( $user->first_name ) ) { - echo "$user->first_name"; - } else if ( ! empty( $user->last_name ) ) { - echo "$user->last_name"; + } elseif ( $user->first_name ) { + echo $user->first_name; + } elseif ( $user->last_name ) { + echo $user->last_name; } else { echo '' . _x( 'Unknown', 'name' ) . ''; } diff --git a/src/wp-admin/includes/class-wp-users-list-table.php b/src/wp-admin/includes/class-wp-users-list-table.php index 7a1359c592..8dd579383b 100644 --- a/src/wp-admin/includes/class-wp-users-list-table.php +++ b/src/wp-admin/includes/class-wp-users-list-table.php @@ -488,10 +488,10 @@ class WP_Users_List_Table extends WP_List_Table { case 'name': if ( $user_object->first_name && $user_object->last_name ) { $r .= "$user_object->first_name $user_object->last_name"; - } else if ( ! empty( $user_object->first_name ) ) { - $r .= "$user_object->first_name"; - } else if ( ! empty( $user_object->last_name) ) { - $r .= "$user_object->last_name"; + } elseif ( $user_object->first_name ) { + $r .= $user_object->first_name; + } elseif ( $user_object->last_name ) { + $r .= $user_object->last_name; } else { $r .= '' . _x( 'Unknown', 'name' ) . ''; }