<!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>[34963] trunk/src/wp-admin/includes/class-wp-users-list-table.php: On the Users list table, show all the roles of a user in a comma-separated list if they have more than one role.</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 { 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/34963">34963</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/34963","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-08 21:58:34 +0000 (Thu, 08 Oct 2015)</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'>On the Users list table, show all the roles of a user in a comma-separated list if they have more than one role. This prevents role obfuscation in situations where a user has had more than one role programmatically assigned to them.
Fixes <a href="https://core.trac.wordpress.org/ticket/22959">#22959</a>
Props scribu, JustinSainton, DrewAPicture, johnbillion</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 2015-10-08 21:48:25 UTC (rev 34962)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2015-10-08 21:58:34 UTC (rev 34963)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,21 +324,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->is_site_users )
</span><span class="cx" style="display: block; padding: 0 10px"> $post_counts = count_many_users_posts( array_keys( $this->items ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editable_roles = array_keys( get_editable_roles() );
-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->items as $userid => $user_object ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( count( $user_object->roles ) <= 1 ) {
- $role = reset( $user_object->roles );
- } elseif ( $roles = array_intersect( array_values( $user_object->roles ), $editable_roles ) ) {
- $role = reset( $roles );
- } else {
- $role = reset( $user_object->roles );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && empty( $user_object->allcaps ) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "\n\t" . $this->single_row( $user_object, $style = '', $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
</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">@@ -346,12 +336,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Generate HTML for a single row on the users.php admin panel.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.2.0 The `$style` argument was deprecated.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0 The `$style` parameter was deprecated.
+ * @since 4.4.0 The `$role` parameter was deprecated.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $user_object The current user object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $style Deprecated. Not used.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $role Optional. Key for the $wp_roles array. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $role Deprecated. Not used.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $numposts Optional. Post count to display for this user. Defaults
</span><span class="cx" style="display: block; padding: 0 10px"> * to zero, as in, a new user has made zero posts.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Output for a single row.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,6 +361,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'users.php?';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_roles = $this->get_role_list( $user_object );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up the hover actions for this user
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $checkbox = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,9 +395,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = apply_filters( 'user_row_actions', $actions, $user_object );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Role classes.
+ $role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up the checkbox ( because the user is editable, otherwise it's empty )
</span><span class="cx" style="display: block; padding: 0 10px"> $checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- . "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ . "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='{$role_classes}' value='{$user_object->ID}' />";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $edit = '<strong>' . $user_object->user_login . '</strong>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,6 +408,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' );
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = get_avatar( $user_object->ID, 32 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Comma-separated list of user roles.
+ $roles_list = implode( ', ', $user_roles );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $r = "<tr id='user-$user_object->ID'>";
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +447,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
</span><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 .= $role_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r .= 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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,4 +494,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_default_primary_column_name() {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'username';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Returns an array of user roles for a given user object.
+ *
+ * @since 4.4.0
+ * @access protected
+ *
+ * @param WP_User $user_object The WP_User object.
+ * @return array An array of user roles.
+ */
+ protected function get_role_list( $user_object ) {
+ global $wp_roles;
+
+ $role_list = array();
+
+ foreach ( $user_object->roles as $role ) {
+ if ( isset( $wp_roles->role_names[ $role ] ) ) {
+ $role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
+ }
+ }
+
+ if ( empty( $role_list ) ) {
+ $role_list['none'] = _x( 'None', 'no user roles' );
+ }
+
+ /**
+ * Filter the returned array of roles for a user.
+ *
+ * @since 4.4.0
+ *
+ * @param array $role_list An array of user roles.
+ * @param WP_User $user_object A WP_User object.
+ */
+ return apply_filters( 'get_role_list', $role_list, $user_object );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>