<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15572] trunk/wp-admin/includes/default-list-tables.php: Use get_users()
in WP_MS_User_Table.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15572">15572</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-05 17:07:36 +0000 (Sun, 05 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use get_users() in WP_MS_User_Table. See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15571 => 15572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-09-05 16:53:59 UTC (rev 15571)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-09-05 17:07:36 UTC (rev 15572)
</span><span class="lines">@@ -2777,51 +2777,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function prepare_items() {
</span><del>- global $s, $mode, $wpdb;
</del><ins>+ $usersearch = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
</ins><span class="cx">
</span><del>- $mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
</del><ins>+ $users_per_page = $this->get_items_per_page( 'ms_users_per_page' );
</ins><span class="cx">
</span><del>- $per_page = $this->get_items_per_page( 'ms_users_per_page' );
</del><ins>+ $paged = $this->get_pagenum();
</ins><span class="cx">
</span><del>- $pagenum = $this->get_pagenum();
</del><ins>+ $args = array(
+ 'number' => $users_per_page,
+ 'offset' => ( $paged-1 ) * $users_per_page,
+ 'search' => $usersearch,
+ 'blog_id' => 0
+ );
</ins><span class="cx">
</span><del>- $s = isset( $_REQUEST['s'] ) ? stripslashes( trim( $_REQUEST[ 's' ] ) ) : '';
- $like_s = esc_sql( like_escape( $s ) );
</del><ins>+ if ( isset( $_REQUEST['orderby'] ) )
+ $args['orderby'] = $_REQUEST['orderby'];
</ins><span class="cx">
</span><del>- $query = "SELECT * FROM {$wpdb->users}";
</del><ins>+ if ( isset( $_REQUEST['order'] ) )
+ $args['order'] = $_REQUEST['order'];
</ins><span class="cx">
</span><del>- if ( !empty( $like_s ) ) {
- $query .= " WHERE user_login LIKE '%$like_s%' OR user_email LIKE '%$like_s%'";
- }
</del><ins>+ // Query the user IDs for this page
+ $wp_user_search = new WP_User_Query( $args );
</ins><span class="cx">
</span><del>- $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : 'id';
- if ( $order_by == 'email' ) {
- $query .= ' ORDER BY user_email ';
- } elseif ( $order_by == 'login' ) {
- $query .= ' ORDER BY user_login ';
- } elseif ( $order_by == 'name' ) {
- $query .= ' ORDER BY display_name ';
- } elseif ( $order_by == 'registered' ) {
- $query .= ' ORDER BY user_registered ';
- } else {
- $order_by = 'id';
- $query .= ' ORDER BY ID ';
- }
-
- $order = ( isset( $_REQUEST['order'] ) && 'DESC' == strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC';
- $query .= $order;
-
- $total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( ID )', $query ) );
-
- $query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
-
- $this->items = $wpdb->get_results( $query, ARRAY_A );
-
- $num_pages = ceil( $total / $per_page );
-
</del><ins>+ $this->items = $wp_user_search->get_results();
+
</ins><span class="cx"> $this->set_pagination_args( array(
</span><del>- 'total_items' => $total,
- 'per_page' => $per_page,
</del><ins>+ 'total_items' => $wp_user_search->get_total(),
+ 'per_page' => $users_per_page,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2882,7 +2864,7 @@
</span><span class="cx"> $status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
</span><span class="cx">
</span><span class="cx"> foreach ( $status_list as $status => $col ) {
</span><del>- if ( $user[$status] )
</del><ins>+ if ( $user->$status )
</ins><span class="cx"> $class = $col;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2896,25 +2878,25 @@
</span><span class="cx"> switch ( $column_name ) {
</span><span class="cx"> case 'cb': ?>
</span><span class="cx"> <th scope="row" class="check-column">
</span><del>- <input type="checkbox" id="blog_<?php echo $user['ID'] ?>" name="allusers[]" value="<?php echo esc_attr( $user['ID'] ) ?>" />
</del><ins>+ <input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
</ins><span class="cx"> </th>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'id': ?>
</span><span class="cx"> <th valign="top" scope="row">
</span><del>- <?php echo $user['ID'] ?>
</del><ins>+ <?php echo $user->ID ?>
</ins><span class="cx"> </th>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'login':
</span><del>- $avatar = get_avatar( $user['user_email'], 32 );
- $edit_link = ( get_current_user_id() == $user['ID'] ) ? 'profile.php' : 'user-edit.php?user_id=' . $user['ID'];
</del><ins>+ $avatar = get_avatar( $user->user_email, 32 );
+ $edit_link = ( get_current_user_id() == $user->ID ) ? 'profile.php' : 'user-edit.php?user_id=' . $user->ID;
</ins><span class="cx"> ?>
</span><span class="cx"> <td class="username column-username">
</span><del>- <?php echo $avatar; ?><strong><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user['user_login'] ); ?></a><?php
- if ( in_array( $user['user_login'], $super_admins ) )
</del><ins>+ <?php echo $avatar; ?><strong><a href="<?php echo esc_url( admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user->user_login ); ?></a><?php
+ if ( in_array( $user->user_login, $super_admins ) )
</ins><span class="cx"> echo ' - ' . __( 'Super admin' );
</span><span class="cx"> ?></strong>
</span><span class="cx"> <br/>
</span><span class="lines">@@ -2922,8 +2904,8 @@
</span><span class="cx"> $actions = array();
</span><span class="cx"> $actions['edit'] = '<a href="' . esc_url( admin_url( $edit_link ) ) . '">' . __( 'Edit' ) . '</a>';
</span><span class="cx">
</span><del>- if ( ! in_array( $user['user_login'], $super_admins ) ) {
- $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user['ID'] ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
</del><ins>+ if ( ! in_array( $user->user_login, $super_admins ) ) {
+ $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo $this->row_actions( $actions );
</span><span class="lines">@@ -2934,12 +2916,12 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'name': ?>
</span><del>- <td class="name column-name"><?php echo $user['display_name'] ?></td>
</del><ins>+ <td class="name column-name"><?php echo $user->display_name ?></td>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'email': ?>
</span><del>- <td class="email column-email"><a href="mailto:<?php echo $user['user_email'] ?>"><?php echo $user['user_email'] ?></a></td>
</del><ins>+ <td class="email column-email"><a href="mailto:<?php echo $user->user_email ?>"><?php echo $user->user_email ?></a></td>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -2949,12 +2931,12 @@
</span><span class="cx"> else
</span><span class="cx"> $date = 'Y/m/d \<\b\r \/\> g:i:s a';
</span><span class="cx"> ?>
</span><del>- <td><?php echo mysql2date( __( $date ), $user['user_registered'] ); ?></td>
</del><ins>+ <td><?php echo mysql2date( __( $date ), $user->user_registered ); ?></td>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'blogs':
</span><del>- $blogs = get_blogs_of_user( $user['ID'], true );
</del><ins>+ $blogs = get_blogs_of_user( $user->ID, true );
</ins><span class="cx"> ?>
</span><span class="cx"> <td>
</span><span class="cx"> <?php
</span><span class="lines">@@ -2982,7 +2964,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default: ?>
</span><del>- <td><?php do_action( 'manage_users_custom_column', $column_name, $user['ID'] ); ?></td>
</del><ins>+ <td><?php do_action( 'manage_users_custom_column', $column_name, $user->ID ); ?></td>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>