From 94af70dea8e9fdca26f3cfe99c2c4f9458f671dc Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 1 Feb 2010 08:12:56 +0000
Subject: [PATCH] Revert [12908]. Update Users cap to use a capability. See
 #12098. Props nacin

git-svn-id: http://svn.automattic.com/wordpress/trunk@12916 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php  | 6 ++----
 wp-admin/users.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 9abea74fa..90cb20ff2 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -128,9 +128,7 @@ else
 if ( current_user_can('edit_users') ) {
 	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
 	$submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
-
-	if ( ! is_multisite() || get_site_option( 'add_new_users' ) )
-		$submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
+	$submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
 
 	$submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
 } else {
@@ -363,4 +361,4 @@ if (! user_can_access_admin_page()) {
 	wp_die( __('You do not have sufficient permissions to access this page.') );
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 239e499a4..e68cb8f87 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -254,7 +254,7 @@ if ( ! empty($messages) ) {
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); if ( !is_multisite() || get_site_option( 'add_new_users' ) ) { ?>  <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a><?php }
+<h2><?php 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 }
 if ( isset($_GET['usersearch']) && $_GET['usersearch'] )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $_GET['usersearch'] ) ); ?>
 </h2>