Wordpress 3.2

[autoinstalls/wordpress.git] / wp-admin / user-edit.php

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index cf3efd41b93be9a2697cb2065c49c72c5298cf1a..6334ed8198d5e8a9bce332c5a8f3f3bade23956c 100644 (file)
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -44,17 +44,14 @@ add_contextual_help($current_screen,
     '<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
     '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>' .
     '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="http://codex.wordpress.org/Users_Your_Profile_SubPanel" target="_blank">Documentation on User Profiles</a>') . '</p>' .
+    '<p>' . __('<a href="http://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>') . '</p>' .
     '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 
 $wp_http_referer = remove_query_arg(array('update', 'delete_count'), stripslashes($wp_http_referer));
 
-$all_post_caps = array('posts', 'pages');
-$user_can_edit = false;
-foreach ( $all_post_caps as $post_cap )
-       $user_can_edit |= current_user_can("edit_$post_cap");
+$user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
 
 /**
  * Optional SSL preference that can be turned on by hooking to the 'personal_options' action.
@@ -161,7 +158,7 @@ include (ABSPATH . 'wp-admin/admin-header.php');
 <div id="message" class="updated">
        <p><strong><?php _e('User updated.') ?></strong></p>
        <?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?>
-       <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Authors and Users'); ?></a></p>
+       <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
        <?php endif; ?>
 </div>
 <?php endif; ?>
@@ -171,7 +168,17 @@ include (ABSPATH . 'wp-admin/admin-header.php');
 
 <div class="wrap" id="profile-page">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h2>
+<?php
+echo esc_html( $title );
+if ( ! IS_PROFILE_PAGE ) {
+       if ( current_user_can( 'create_users' ) ) { ?>
+               <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
+       <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
+               <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+       <?php }
+} ?>
+</h2>
 
 <form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post"<?php do_action('user_edit_form_tag'); ?>>
 <?php wp_nonce_field('update-user_' . $user_id) ?>
@@ -213,7 +220,7 @@ if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 <?php /* translators: Show admin bar when viewing site */ _e( 'when viewing site' ); ?></label><br />
 <label for="admin_bar_admin">
 <input name="admin_bar_admin" type="checkbox" id="admin_bar_admin" value="1" <?php checked( _get_admin_bar_pref( 'admin', $profileuser->ID ) ); ?> />
-<?php /* translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label>
+<?php /* translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label></fieldset>
 </td>
 </tr>
 <?php do_action('personal_options', $profileuser); ?>
@@ -284,23 +291,29 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
                <select name="display_name" id="display_name">
                <?php
                        $public_display = array();
-                       $public_display['display_username']  = $profileuser->user_login;
                        $public_display['display_nickname']  = $profileuser->nickname;
+                       $public_display['display_username']  = $profileuser->user_login;
+
                        if ( !empty($profileuser->first_name) )
                                $public_display['display_firstname'] = $profileuser->first_name;
+
                        if ( !empty($profileuser->last_name) )
                                $public_display['display_lastname'] = $profileuser->last_name;
+
                        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
                                $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
                                $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
                        }
+
                        if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
                                $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+
                        $public_display = array_map( 'trim', $public_display );
                        $public_display = array_unique( $public_display );
+
                        foreach ( $public_display as $id => $item ) {
                ?>
-                       <option id="<?php echo $id; ?>" value="<?php echo esc_attr($item); ?>"<?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
+                       <option id="<?php echo $id; ?>"<?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
                <?php
                        }
                ?>