<!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>[13956] trunk: Make remove_user a meta capability.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13956">13956</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-03 05:14:34 +0000 (Sat, 03 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make remove_user a meta capability. see <a href="http://trac.wordpress.org/ticket/12793">#12793</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (13955 => 13956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-04-03 04:38:20 UTC (rev 13955)
+++ trunk/wp-admin/includes/schema.php 2010-04-03 05:14:34 UTC (rev 13956)
</span><span class="lines">@@ -607,7 +607,6 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $role ) ) {
</span><span class="cx"> $role->add_cap( 'update_core' );
</span><del>- $role->add_cap( 'remove_user' );
</del><span class="cx"> $role->add_cap( 'remove_users' );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (13955 => 13956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-04-03 04:38:20 UTC (rev 13955)
+++ trunk/wp-admin/includes/upgrade.php 2010-04-03 05:14:34 UTC (rev 13956)
</span><span class="lines">@@ -1126,6 +1126,13 @@
</span><span class="cx"> $wpdb->update( $wpdb->postmeta, array( 'meta_key' => '_menu_item_xfn' ), array( 'meta_key' => 'menu_item_xfn' ) );
</span><span class="cx"> $wpdb->update( $wpdb->postmeta, array( 'meta_key' => '_menu_item_url' ), array( 'meta_key' => 'menu_item_url' ) );
</span><span class="cx"> }
</span><ins>+
+ // 3.0-beta1 remove_user primitive->meta cap. can be removed before release
+ if ( $wp_current_db_version >= 12751 && $wp_current_db_version < 12751 ) {
+ $role =& get_role( 'administrator' );
+ if ( ! empty( $role ) )
+ $role->remove_cap( 'remove_user' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (13955 => 13956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-04-03 04:38:20 UTC (rev 13955)
+++ trunk/wp-admin/users.php 2010-04-03 05:14:34 UTC (rev 13956)
</span><span class="lines">@@ -15,9 +15,13 @@
</span><span class="cx"> if ( !current_user_can('edit_users') )
</span><span class="cx"> wp_die(__('Cheatin&#8217; uh?'));
</span><span class="cx">
</span><del>-$del_cap_type = 'remove';
-if ( !is_multisite() && current_user_can('delete_users') )
- $del_cap_type = 'delete';
</del><ins>+if ( ! is_multisite() && current_user_can('delete_users') ) {
+ $del_cap_user = 'delete_user';
+ $del_cap_users = 'delete_users';
+} else {
+ $del_cap_user = 'remove_user';
+ $del_cap_users = 'remove_users';
+}
</ins><span class="cx">
</span><span class="cx"> $title = __('Users');
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="lines">@@ -85,16 +89,16 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !current_user_can($del_cap_type . '_users') )
- wp_die(__('You can&#8217;t delete users.'));
</del><ins>+ if ( ! current_user_can($del_cap_users ) )
+ wp_die(__('You can&#8217;t remove users.'));
</ins><span class="cx">
</span><span class="cx"> $userids = $_REQUEST['users'];
</span><span class="cx"> $update = 'del';
</span><span class="cx"> $delete_count = 0;
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $userids as $id) {
</span><del>- if ( ! current_user_can($del_cap_type . '_user', $id) )
- wp_die(__('You can&#8217;t delete that user.'));
</del><ins>+ if ( ! current_user_can( $del_cap_user, $id ) )
+ wp_die(__( 'You can&#8217;t remove that user.' ) );
</ins><span class="cx">
</span><span class="cx"> if ( $id == $current_user->ID ) {
</span><span class="cx"> $update = 'err_admin_del';
</span><span class="lines">@@ -132,8 +136,8 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !current_user_can($del_cap_type . '_users') )
- $errors = new WP_Error('edit_users', __('You can&#8217;t delete users.'));
</del><ins>+ if ( ! current_user_can( $del_cap_users ) )
+ $errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
</ins><span class="cx">
</span><span class="cx"> if ( empty($_REQUEST['users']) )
</span><span class="cx"> $userids = array(intval($_REQUEST['user']));
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (13955 => 13956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-04-03 04:38:20 UTC (rev 13955)
+++ trunk/wp-includes/capabilities.php 2010-04-03 05:14:34 UTC (rev 13956)
</span><span class="lines">@@ -796,6 +796,9 @@
</span><span class="cx"> $caps = array();
</span><span class="cx">
</span><span class="cx"> switch ( $cap ) {
</span><ins>+ case 'remove_user':
+ $caps[] = 'remove_users';
+ break;
</ins><span class="cx"> case 'delete_user':
</span><span class="cx"> $caps[] = 'delete_users';
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (13955 => 13956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2010-04-03 04:38:20 UTC (rev 13955)
+++ trunk/wp-includes/version.php 2010-04-03 05:14:34 UTC (rev 13956)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 13803;
</del><ins>+$wp_db_version = 13956;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>