<!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>[17432] branches/3.1/wp-admin: Add additional promote_users checks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17432">17432</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-02-09 17:30:46 +0000 (Wed, 09 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add additional promote_users checks. Show Add existing button only for multisite. Don't show bulk actions if user can't promote users. Show add new user menu if user has create_users but not promote_users. 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="#branches31wpadminmenuphp">branches/3.1/wp-admin/menu.php</a></li>
<li><a href="#branches31wpadminusernewphp">branches/3.1/wp-admin/user-new.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 (17431 => 17432)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/includes/class-wp-users-list-table.php 2011-02-09 17:30:26 UTC (rev 17431)
+++ branches/3.1/wp-admin/includes/class-wp-users-list-table.php 2011-02-09 17:30:46 UTC (rev 17432)
</span><span class="lines">@@ -132,6 +132,8 @@
</span><span class="cx"> function extra_tablenav( $which ) {
</span><span class="cx"> if ( 'top' != $which )
</span><span class="cx"> return;
</span><ins>+ if ( ! current_user_can( 'promote_users' ) )
+ return;
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <label class="screen-reader-text" for="new_role"><?php _e( 'Change role to&hellip;' ) ?></label>
</span></span></pre></div>
<a id="branches31wpadminmenuphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/menu.php (17431 => 17432)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/menu.php 2011-02-09 17:30:26 UTC (rev 17431)
+++ branches/3.1/wp-admin/menu.php 2011-02-09 17:30:46 UTC (rev 17432)
</span><span class="lines">@@ -191,13 +191,19 @@
</span><span class="cx"> if ( current_user_can('list_users') ) {
</span><span class="cx"> $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
</span><span class="cx"> $submenu['users.php'][5] = array(__('Users'), 'list_users', 'users.php');
</span><del>- $submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
</del><ins>+ if ( current_user_can('create_users') )
+ $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
+ else
+ $submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
</ins><span class="cx">
</span><span class="cx"> $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
</span><span class="cx"> } else {
</span><span class="cx"> $_wp_real_parent_file['users.php'] = 'profile.php';
</span><span class="cx"> $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
</span><del>- $submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
</del><ins>+ if ( current_user_can('create_users') )
+ $submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php');
+ else
+ $submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'div' );
</span></span></pre></div>
<a id="branches31wpadminusernewphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/user-new.php (17431 => 17432)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/user-new.php 2011-02-09 17:30:26 UTC (rev 17431)
+++ branches/3.1/wp-admin/user-new.php 2011-02-09 17:30:46 UTC (rev 17432)
</span><span class="lines">@@ -9,8 +9,12 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><del>-if ( ! current_user_can('create_users') && ! current_user_can('promote_users') )
- wp_die(__('Cheatin&#8217; uh?'));
</del><ins>+if ( is_multisite() ) {
+ if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) )
+ wp_die( __( 'Cheatin&#8217; uh?' ) );
+} elseif ( ! current_user_can( 'create_users' ) ) {
+ wp_die( __( 'Cheatin&#8217; uh?' ) );
+}
</ins><span class="cx">
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> function admin_created_user_email( $text ) {
</span></span></pre></div>
<a id="branches31wpadminusersphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/users.php (17431 => 17432)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/users.php 2011-02-09 17:30:26 UTC (rev 17431)
+++ branches/3.1/wp-admin/users.php 2011-02-09 17:30:46 UTC (rev 17432)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> case 'promote':
</span><span class="cx"> check_admin_referer('bulk-users');
</span><span class="cx">
</span><ins>+ if ( ! current_user_can( 'promote_users' ) )
+ wp_die( __( 'You can&#8217;t edit that user.' ) );
+
</ins><span class="cx"> if ( empty($_REQUEST['users']) ) {
</span><span class="cx"> wp_redirect($redirect);
</span><span class="cx"> exit();
</span><span class="lines">@@ -352,7 +355,7 @@
</span><span class="cx"> echo esc_html( $title );
</span><span class="cx"> if ( current_user_can( 'create_users' ) ) { ?>
</span><span class="cx"> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
</span><del>-<?php } elseif ( current_user_can( 'promote_users' ) ) { ?>
</del><ins>+<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
</ins><span class="cx"> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
</span><span class="cx"> <?php }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>