Changeset 54070

Timestamp:

09/05/2022 04:00:16 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use more meaningful variable names in WP_Users_List_Table.

This renames some variables for clarity, per the ​Naming Conventions:

Don’t abbreviate variable names unnecessarily; let the code be unambiguous and self-documenting.

• $c is renamed to $columns in ::get_columns() and ::get_sortable_columns().
• $r is renamed to $row in ::single_row().

Follow-up to [3677], [5542], [6852], [8936], [15491], [16573].

Props burhandodhy, costdev, mukesh27, Presskopp.
See #56448, #55647.

File:

• trunk/src/wp-admin/includes/class-wp-users-list-table.php (modified) (9 diffs)

trunk/src/wp-admin/includes/class-wp-users-list-table.php

@@ -366 +366 @@
          */
         public function get_columns() {
-                $c = array(
+                $columns = array(
                         'cb'       => '<input type="checkbox" />',
                         'username' => __( 'Username' ),
@@ -376 +376 @@
 
                 if ( $this->is_site_users ) {
-                        unset( $c['posts'] );
-                }
-
-                return $c;
+                        unset( $columns['posts'] );
+                }
+
+                return $columns;
         }
 
@@ -390 +390 @@
          */
         protected function get_sortable_columns() {
-                $c = array(
+                $columns = array(
                         'username' => 'login',
                         'email'    => 'email',
                 );
 
-                return $c;
+                return $columns;
         }
 
@@ -538 +538 @@
                 $roles_list = implode( ', ', $user_roles );
 
-                $r = "<tr id='user-$user_object->ID'>";
+                $row = "<tr id='user-$user_object->ID'>";
 
                 list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
@@ -560 +560 @@
 
                         if ( 'cb' === $column_name ) {
-                                $r .= "<th scope='row' class='check-column'>$checkbox</th>";
+                                $row .= "<th scope='row' class='check-column'>$checkbox</th>";
                         } else {
-                                $r .= "<td $attributes>";
+                                $row .= "<td $attributes>";
                                 switch ( $column_name ) {
                                         case 'username':
-                                                $r .= "$avatar $edit";
+                                                $row .= "$avatar $edit";
                                                 break;
                                         case 'name':
                                                 if ( $user_object->first_name && $user_object->last_name ) {
-                                                        $r .= sprintf(
+                                                        $row .= sprintf(
                                                                 /* translators: 1: User's first name, 2: Last name. */
                                                                 _x( '%1$s %2$s', 'Display name based on first name and last name' ),
@@ -576 +576 @@
                                                         );
                                                 } elseif ( $user_object->first_name ) {
-                                                        $r .= $user_object->first_name;
+                                                        $row .= $user_object->first_name;
                                                 } elseif ( $user_object->last_name ) {
-                                                        $r .= $user_object->last_name;
+                                                        $row .= $user_object->last_name;
                                                 } else {
-                                                        $r .= sprintf(
+                                                        $row .= sprintf(
                                                                 '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
                                                                 _x( 'Unknown', 'name' )
@@ -587 +587 @@
                                                 break;
                                         case 'email':
-                                                $r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
+                                                $row .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
                                                 break;
                                         case 'role':
-                                                $r .= esc_html( $roles_list );
+                                                $row .= esc_html( $roles_list );
                                                 break;
                                         case 'posts':
                                                 if ( $numposts > 0 ) {
-                                                        $r .= sprintf(
+                                                        $row .= sprintf(
                                                                 '<a href="%s" class="edit"><span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
                                                                 "edit.php?author={$user_object->ID}",
@@ -605 +605 @@
                                                         );
                                                 } else {
-                                                        $r .= 0;
+                                                        $row .= 0;
                                                 }
                                                 break;
@@ -618 +618 @@
                                                  * @param int    $user_id     ID of the currently-listed user.
                                                  */
-                                                $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+                                                $row .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
                                 }
 
                                 if ( $primary === $column_name ) {
-                                        $r .= $this->row_actions( $actions );
+                                        $row .= $this->row_actions( $actions );
                                 }
-                                $r .= '</td>';
-                        }
-                }
-                $r .= '</tr>';
-
-                return $r;
+                                $row .= '</td>';
+                        }
+                }
+                $row .= '</tr>';
+
+                return $row;
         }