From 767c3538b9f4aa2684429a7efea8f7728034c754 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 5 Oct 2006 17:45:26 +0000
Subject: WP Merge to rev 4347

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@789 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/users.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'wp-admin/users.php')

diff --git a/wp-admin/users.php b/wp-admin/users.php
index f0277b0..45f7156 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -84,15 +84,15 @@ class WP_User_Search {
 
 	function do_paging() {
 		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
-			$prev_page = ( $this->page > 1) ? true : false;
-			$next_page = ( ($this->page * $this->users_per_page) < $this->total_users_for_query ) ? true : false;
-			$this->paging_text = '';
-			if ( $prev_page )
-				$this->paging_text .= '<p class="alignleft"><a href="' . add_query_arg(array('usersearch' => $this->search_term, 'userspage' => $this->page - 1), 'users.php?') . '">&laquo; Previous Page</a></p>';
-			if ( $next_page )
-				$this->paging_text .= '<p class="alignright"><a href="' . add_query_arg(array('usersearch' => $this->search_term, 'userspage' => $this->page + 1), 'users.php?') . '">Next Page &raquo;</a></p>';
-			if ( $prev_page || $next_page )
-				$this->paging_text .= '<br style="clear:both" />';
+			$this->paging_text = paginate_links( array(
+				'total' => ceil($this->total_users_for_query / $this->users_per_page),
+				'current' => $this->page,
+				'prev_text' => '&laquo; Previous Page',
+				'next_text' => 'Next Page &raquo;',
+				'base' => 'users.php?%_%',
+				'format' => 'userspage=%#%',
+				'add_args' => array( 'usersearch' => urlencode($this->search_term) )
+			) );
 		}
 	}
 
@@ -497,7 +497,7 @@ default:
 <table class="widefat">
 <?php
 foreach($roleclasses as $role => $roleclass) {
-	ksort($roleclass);
+	uksort($roleclass, "strnatcasecmp");
 ?>
 
 <tr>
-- 
cgit