From ae4c6c70c0e2678f42525f5223e92a892f89e8cc Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 19 Dec 2010 22:27:30 +0000
Subject: [PATCH] Improve the button and header test to give a clearer picture
 between Adding New Users and Adding Exiting Users to a site. Fixes #14756

git-svn-id: http://svn.automattic.com/wordpress/trunk@17069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-new.php |  8 +++++++-
 wp-admin/users.php    | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 1ad39de69d..0d958bc2ca 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -182,7 +182,13 @@ if ( isset($_GET['update']) ) {
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
+<h2 id="add-new-user"> <?php
+if ( current_user_can( 'create_users' ) ) {
+	echo _x( 'Add New User', 'user' );
+} elseif ( current_user_can( 'promote_users' ) ) {
+	echo _x( 'Add Existing User', 'user' );
+} ?>
+</h2>
 
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 4f4311356e..f0f3dc1046 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -343,7 +343,15 @@ if ( ! empty($messages) ) {
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); if ( current_user_can( 'create_users' ) || current_user_can( 'promote_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 } elseif ( 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 }
+
 if ( $usersearch )
 	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
 </h2>