<!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>[19646] branches/3.3: Only allow _multisite_ super admins to demote themselves on a site.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19646">19646</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-01-02 21:45:38 +0000 (Mon, 02 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only allow _multisite_ super admins to demote themselves on a site. props linuxologos, fixes <a href="http://core.trac.wordpress.org/ticket/19684">#19684</a> for 3.3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches33wpadminusersphp">branches/3.3/wp-admin/users.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches33">branches/3.3/</a></li>
<li><a href="#branches33wpincludescapabilitiesphp">branches/3.3/wp-includes/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches33"></a>
<div class="propset"><h4>Property changes: branches/3.3</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk:18512,19638-19639,19641
</span><span class="cx"> + /branches/3.1:18031
</span><span class="cx">/trunk:18512,19638-19641
</span><a id="branches33wpadminusersphp"></a>
<div class="modfile"><h4>Modified: branches/3.3/wp-admin/users.php (19645 => 19646)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.3/wp-admin/users.php 2012-01-02 21:41:56 UTC (rev 19645)
+++ branches/3.3/wp-admin/users.php 2012-01-02 21:45:38 UTC (rev 19646)
</span><span class="lines">@@ -100,10 +100,11 @@
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('promote_user', $id) )
</span><span class="cx"> wp_die(__('You can&#8217;t edit that user.'));
</span><del>- // The new role of the current user must also have the promote_users cap or be a super admin
- if ( $id == $current_user->ID && ! is_super_admin() && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users') ) {
- $update = 'err_admin_role';
- continue;
</del><ins>+ // The new role of the current user must also have the promote_users cap or be a multisite super admin
+ if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
+ && ! ( is_multisite() && is_super_admin() ) ) {
+ $update = 'err_admin_role';
+ continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the user doesn't already belong to the blog, bail.
</span></span></pre></div>
<a id="branches33wpincludescapabilitiesphp"></a>
<div class="propset"><h4>Property changes: branches/3.3/wp-includes/capabilities.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/wp-includes/capabilities.php:18512,19596,19638-19639,19641
</span><span class="cx"> + /branches/3.1/wp-includes/capabilities.php:18031
</span><span class="cx">/trunk/wp-includes/capabilities.php:18512,19596,19638-19641
</span></div>
</body>
</html>