Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add additional promote_users checks. Show Add existing button only fo…

…r 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 #16501 for trunk

git-svn-id: http://svn.automattic.com/wordpress/trunk@17431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
commit ba47c80ef773e48e15501af7071521412092db63 1 parent 3cd43bf
ryan authored
View
2  wp-admin/includes/class-wp-users-list-table.php
@@ -132,6 +132,8 @@ function get_bulk_actions() {
function extra_tablenav( $which ) {
if ( 'top' != $which )
return;
+ if ( ! current_user_can( 'promote_users' ) )
+ return;
?>
<div class="alignleft actions">
<label class="screen-reader-text" for="new_role"><?php _e( 'Change role to&hellip;' ) ?></label>
View
10 wp-admin/menu.php
@@ -191,13 +191,19 @@ function _add_themes_utility_last() {
if ( current_user_can('list_users') ) {
$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
$submenu['users.php'][5] = array(__('Users'), 'list_users', 'users.php');
- $submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
+ 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');
$submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
} else {
$_wp_real_parent_file['users.php'] = 'profile.php';
$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
- $submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
+ 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');
}
$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'div' );
View
8 wp-admin/user-new.php
@@ -9,8 +9,12 @@
/** WordPress Administration Bootstrap */
require_once('./admin.php');
-if ( ! current_user_can('create_users') && ! current_user_can('promote_users') )
- wp_die(__('Cheatin&#8217; uh?'));
+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?' ) );
+}
if ( is_multisite() ) {
function admin_created_user_email( $text ) {
View
5 wp-admin/users.php
@@ -48,6 +48,9 @@
case 'promote':
check_admin_referer('bulk-users');
+ if ( ! current_user_can( 'promote_users' ) )
+ wp_die( __( 'You can&#8217;t edit that user.' ) );
+
if ( empty($_REQUEST['users']) ) {
wp_redirect($redirect);
exit();
@@ -352,7 +355,7 @@
echo esc_html( $title );
if ( current_user_can( 'create_users' ) ) { ?>
<a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-<?php } elseif ( current_user_can( 'promote_users' ) ) { ?>
+<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
<a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
<?php }
Please sign in to comment.
Something went wrong with that request. Please try again.