<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17440] branches/3.1/wp-admin: Disallow and hide user removal (
as opposed to deletion) for single site installs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17440">17440</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-02-10 20:38:04 +0000 (Thu, 10 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disallow and hide user removal (as opposed to deletion) for single site installs. Removal is a multisite concept. Props nacin. fixes <a href="http://trac.wordpress.org/ticket/16501">#16501</a> for 3.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpadminincludesclasswpuserslisttablephp">branches/3.1/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#branches31wpadminusersphp">branches/3.1/wp-admin/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/includes/class-wp-users-list-table.php (17439 => 17440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/includes/class-wp-users-list-table.php 2011-02-10 20:37:26 UTC (rev 17439)
+++ branches/3.1/wp-admin/includes/class-wp-users-list-table.php 2011-02-10 20:38:04 UTC (rev 17440)
</span><span class="lines">@@ -121,10 +121,13 @@
</span><span class="cx"> function get_bulk_actions() {
</span><span class="cx"> $actions = array();
</span><span class="cx">
</span><del>- if ( !is_multisite() && current_user_can( 'delete_users' ) )
- $actions['delete'] = __( 'Delete' );
- else
- $actions['remove'] = __( 'Remove' );
</del><ins>+ if ( is_multisite() ) {
+ if ( current_user_can( 'remove_users' ) )
+ $actions['remove'] = __( 'Remove' );
+ } else {
+ if ( current_user_can( 'delete_users' ) )
+ $actions['delete'] = __( 'Delete' );
+ }
</ins><span class="cx">
</span><span class="cx"> return $actions;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches31wpadminusersphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/users.php (17439 => 17440)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/users.php 2011-02-10 20:37:26 UTC (rev 17439)
+++ branches/3.1/wp-admin/users.php 2011-02-10 20:38:04 UTC (rev 17440)
</span><span class="lines">@@ -200,13 +200,16 @@
</span><span class="cx"> case 'doremove':
</span><span class="cx"> check_admin_referer('remove-users');
</span><span class="cx">
</span><ins>+ if ( ! is_multisite() )
+ wp_die( __( 'You can&#8217;t remove users.' ) );
+
</ins><span class="cx"> if ( empty($_REQUEST['users']) ) {
</span><span class="cx"> wp_redirect($redirect);
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !current_user_can('remove_users') )
- die(__('You can&#8217;t remove users.'));
</del><ins>+ if ( ! current_user_can( 'remove_users' ) )
+ wp_die( __( 'You can&#8217;t remove users.' ) );
</ins><span class="cx">
</span><span class="cx"> $userids = $_REQUEST['users'];
</span><span class="cx">
</span><span class="lines">@@ -234,6 +237,9 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer('bulk-users');
</span><span class="cx">
</span><ins>+ if ( ! is_multisite() )
+ wp_die( __( 'You can&#8217;t remove users.' ) );
+
</ins><span class="cx"> if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
</span><span class="cx"> wp_redirect($redirect);
</span><span class="cx"> exit();
</span></span></pre>
</div>
</div>
</body>
</html>