Changeset 8242 for branches/crazyhorse/wp-admin/includes/user.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-admin/includes/user.php (modified) (2 diffs)

branches/crazyhorse/wp-admin/includes/user.php

@@ -355 +355 @@
     function do_paging() {
         if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
+            $args = array();
+            if( ! empty($this->search_term) )
+                $args['usersearch'] = urlencode($this->search_term);
+            if( ! empty($this->role) )
+                $args['role'] = urlencode($this->role);
+
             $this->paging_text = paginate_links( array(
                 'total' => ceil($this->total_users_for_query / $this->users_per_page),
@@ -360 +366 @@
                 'base' => 'users.php?%_%',
                 'format' => 'userspage=%#%',
-                'add_args' => array( 'usersearch' => urlencode($this->search_term) )
+                'add_args' => $args
             ) );
         }