WP Merge to rev 4349

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@793 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 10 insertions, 6 deletions

diff --git a/wp-admin/users.php b/wp-admin/users.php
index 45f7156..96e9730 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -64,8 +64,6 @@ class WP_User_Search {
 		}
 		$this->query_from_where = "FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities' $search_sql";
 
-		if ( !$_GET['update'] && !$this->search_term && !$this->raw_page && $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities'") > $this->users_per_page )
-			$this->too_many_total_users = sprintf(__('Because this blog has more than %s users, they cannot all be shown on one page.  Use the paging or search functionality in order to find the user you want to edit.'), $this->users_per_page);
 	}
 
 	function query() {
@@ -465,7 +463,7 @@ default:
 	<?php endif; ?>
 
 	<form action="" method="get" name="search" id="search">
-		<p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($wp_user_search->search_term, 1); ?>" /> <input type="submit" value="<?php _e('Search for users &raquo;'); ?>" /></p>
+		<p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($wp_user_search->search_term, 1); ?>" /> <input type="submit" value="<?php _e('Search 	users &raquo;'); ?>" class="button" /></p>
 	</form>
 
 	<?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?>
@@ -486,10 +484,14 @@ default:
 		<p><a href="users.php"><?php _e('&laquo; Back to All Users'); ?></a></p>
 	<?php endif; ?>
 
-	<h3><?php printf(__('%1$s &#8211; %2$s of %3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); ?></h3>
+	<h3><?php 
+	if ( 0 == $wp_user_search->first_user && $wp_user_search->total_users_for_query <= 50 )
+		printf(__('%3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query);
+	else
+		printf(__('%1$s &#8211; %2$s of %3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); ?></h3>
 
 	<?php if ( $wp_user_search->results_are_paged() ) : ?>
-		<div class="user-paging-text"><?php $wp_user_search->page_links(); ?></p></div>
+		<div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
 	<?php endif; ?>
 
 <form action="" method="post" name="updateusers" id="updateusers">
@@ -529,7 +531,7 @@ foreach ( (array) $roleclass as $user_object ) {
 </table>
 
 <?php if ( $wp_user_search->results_are_paged() ) : ?>
-	<div class="user-paging-text"><?php $wp_user_search->page_links(); ?></div>
+	<div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
 <?php endif; ?>
 
 	<h3><?php _e('Update Selected'); ?></h3>
@@ -560,6 +562,7 @@ foreach ( (array) $roleclass as $user_object ) {
 
 <div class="wrap">
 <h2><?php _e('Add User From Community') ?></h2>
+<div class="narrow">
 <form action="" method="post" name="adduser" id="adduser">
 <?php wp_nonce_field('add-user') ?>
 <input type='hidden' name='action' value='addexistinguser'>
@@ -582,6 +585,7 @@ foreach ( (array) $roleclass as $user_object ) {
 	<?php echo $referer; ?>
 	<input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User &raquo;') ?>" />
 </p>
+</div>
 </form>
 
 <?php if ( is_wp_error( $add_user_errors ) ) : ?>