<!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>[42855] trunk: Users: Use `promote_users` for role updates in `edit_user()`.</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/42855">42855</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/42855","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-03-19 20:28:28 +0000 (Mon, 19 Mar 2018)</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'>Users: Use `promote_users` for role updates in `edit_user()`.
`edit_user()` can also update user roles but was still using the `edit_users` capability instead of the newer `promote_users` capability introduced in <a href="https://core.trac.wordpress.org/changeset/14176">[14176]</a>.
This makes the role handling consistent with the bulk dropdown menu for role changes.
Props flixos90, johnjamesjacoby, ocean90.
Fixes <a href="https://core.trac.wordpress.org/ticket/42564">#42564</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2018-03-18 20:03:59 UTC (rev 42854)
+++ trunk/src/wp-admin/includes/user.php 2018-03-19 20:28:28 UTC (rev 42855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,9 +30,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function edit_user( $user_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_roles = wp_roles();
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new stdClass;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = (int) $user_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $update = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user->ID = (int) $user_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user->ID = $user_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $userdata = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $user->user_login = wp_slash( $userdata->user_login );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,20 +52,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pass2 = $_POST['pass2'];
</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">- if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
- $new_role = sanitize_text_field( $_POST['role'] );
- $potential_role = isset( $wp_roles->role_objects[ $new_role ] ) ? $wp_roles->role_objects[ $new_role ] : false;
- // Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
- // Multisite super admins can freely edit their blog roles -- they possess all caps.
- if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ( $potential_role && $potential_role->has_cap( 'edit_users' ) ) ) {
- $user->role = $new_role;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_POST['role'] ) && current_user_can( 'promote_users' ) && ( ! $user_id || current_user_can( 'promote_user', $user_id ) ) ) {
+ $new_role = sanitize_text_field( $_POST['role'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the new role isn't editable by the logged-in user die with error
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the new role isn't editable by the logged-in user die with error.
</ins><span class="cx" style="display: block; padding: 0 10px"> $editable_roles = get_editable_roles();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $new_role ) && empty( $editable_roles[ $new_role ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $potential_role = isset( $wp_roles->role_objects[ $new_role ] ) ? $wp_roles->role_objects[ $new_role ] : false;
+
+ /*
+ * Don't let anyone with 'promote_users' edit their own role to something without it.
+ * Multisite super admins can freely edit their roles, they possess all caps.
+ */
+ if (
+ ( is_multisite() && current_user_can( 'manage_network_users' ) ) ||
+ $user_id !== get_current_user_id() ||
+ ( $potential_role && $potential_role->has_cap( 'promote_users' ) )
+ ) {
+ $user->role = $new_role;
+ }
</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 ( isset( $_POST['email'] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2018-03-18 20:03:59 UTC (rev 42854)
+++ trunk/tests/phpunit/tests/user.php 2018-03-19 20:28:28 UTC (rev 42855)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1541,4 +1541,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( '\'Test\' blog\'s "name" has <html entities> &', $email->subject, 'Email subject does not contain the decoded HTML entities' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( ''Test' blog's "name" has <html entities> &', $email->subject, 'Email subject does contains HTML entities' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 42564
+ */
+ function test_edit_user_role_update() {
+ $_POST = $_GET = $_REQUEST = array();
+
+ $administrator = self::factory()->user->create(
+ array(
+ 'role' => 'administrator',
+ )
+ );
+
+ wp_set_current_user( $administrator );
+
+ // Don't let anyone with 'promote_users' (administrator) edit their own role to something without it (subscriber).
+ $_POST['role'] = 'subscriber';
+ $_POST['email'] = 'subscriber@subscriber.test';
+ $_POST['nickname'] = 'subscriber';
+ $this->assertSame( $administrator, edit_user( $administrator ) );
+
+ // Should still have the old role.
+ $this->assertSame( array( 'administrator' ), get_userdata( $administrator )->roles );
+
+ // Promote an editor to an administrator.
+ $editor = self::factory()->user->create(
+ array(
+ 'role' => 'editor',
+ )
+ );
+
+ $_POST['role'] = 'administrator';
+ $_POST['email'] = 'administrator@administrator.test';
+ $_POST['nickname'] = 'administrator';
+ $this->assertSame( $editor, edit_user( $editor ) );
+
+ // Should have the new role.
+ $this->assertSame( array( 'administrator' ), get_userdata( $editor )->roles );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>