<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54070] trunk/src/wp-admin/includes/class-wp-users-list-table.php: Coding Standards: Use more meaningful variable names in `WP_Users_List_Table`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54070">54070</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54070","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-05 16:00:16 +0000 (Mon, 05 Sep 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use more meaningful variable names in `WP_Users_List_Table`.
This renames some variables for clarity, per the [https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#naming-conventions 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 <a href="https://core.trac.wordpress.org/changeset/3677">[3677]</a>, <a href="https://core.trac.wordpress.org/changeset/5542">[5542]</a>, <a href="https://core.trac.wordpress.org/changeset/6852">[6852]</a>, <a href="https://core.trac.wordpress.org/changeset/8936">[8936]</a>, <a href="https://core.trac.wordpress.org/changeset/15491">[15491]</a>, <a href="https://core.trac.wordpress.org/changeset/16573">[16573]</a>.
Props burhandodhy, costdev, mukesh27, Presskopp.
See <a href="https://core.trac.wordpress.org/ticket/56448">#56448</a>, <a href="https://core.trac.wordpress.org/ticket/55647">#55647</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2022-09-05 15:18:13 UTC (rev 54069)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2022-09-05 16:00:16 UTC (rev 54070)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string[] Array of column titles keyed by their column name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_columns() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $columns = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'cb' => '<input type="checkbox" />',
</span><span class="cx" style="display: block; padding: 0 10px"> 'username' => __( 'Username' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Name' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,10 +375,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_users ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $c['posts'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $columns['posts'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $c;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $columns;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,12 +389,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of sortable columns.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_sortable_columns() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $c = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $columns = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'username' => 'login',
</span><span class="cx" style="display: block; padding: 0 10px"> 'email' => 'email',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $c;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $columns;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Comma-separated list of user roles.
</span><span class="cx" style="display: block; padding: 0 10px"> $roles_list = implode( ', ', $user_roles );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = "<tr id='user-$user_object->ID'>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row = "<tr id='user-$user_object->ID'>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,16 +559,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = "class='$classes' $data";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'cb' === $column_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= "<th scope='row' class='check-column'>$checkbox</th>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= "<th scope='row' class='check-column'>$checkbox</th>";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= "<td $attributes>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= "<td $attributes>";
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $column_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'username':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= "$avatar $edit";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= "$avatar $edit";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'name':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_object->first_name && $user_object->last_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: User's first name, 2: Last name. */
</span><span class="cx" style="display: block; padding: 0 10px"> _x( '%1$s %2$s', 'Display name based on first name and last name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $user_object->first_name,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,11 +575,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_object->last_name
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user_object->first_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= $user_object->first_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= $user_object->first_name;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user_object->last_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= $user_object->last_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= $user_object->last_name;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> _x( 'Unknown', 'name' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,14 +586,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'email':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'role':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= esc_html( $roles_list );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= esc_html( $roles_list );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'posts':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $numposts > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" class="edit"><span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
</span><span class="cx" style="display: block; padding: 0 10px"> "edit.php?author={$user_object->ID}",
</span><span class="cx" style="display: block; padding: 0 10px"> $numposts,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,7 +604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,18 +617,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $column_name Column name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id ID of the currently-listed user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $primary === $column_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= $this->row_actions( $actions );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= $this->row_actions( $actions );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= '</td>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= '</td>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= '</tr>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $row .= '</tr>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $r;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $row;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>