<!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>[15574] trunk/wp-includes: Use get_users() in wp_dropdown_users().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15574">15574</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-05 18:47:25 +0000 (Sun, 05 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use get_users() in wp_dropdown_users(). See <a href="http://trac.wordpress.org/ticket/14572">#14572</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15573 => 15574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-09-05 18:19:38 UTC (rev 15573)
+++ trunk/wp-includes/functions.php 2010-09-05 18:47:25 UTC (rev 15574)
</span><span class="lines">@@ -2980,6 +2980,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Extract a slice of an array, given a list of keys
+ *
+ * @since 3.1.0
+ *
+ * @param array $array The original array
+ * @param array $keys The list of keys
+ * @return array The array slice
+ */
+function wp_array_slice_assoc( $array, $keys ) {
+ $slice = array();
+ foreach ( $keys as $key )
+ if ( isset( $array[ $key ] ) )
+ $slice[ $key ] = $array[ $key ];
+
+ return $slice;
+}
+
+/**
</ins><span class="cx"> * Filters a list of objects, based on a set of key => value arguments
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15573 => 15574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-09-05 18:19:38 UTC (rev 15573)
+++ trunk/wp-includes/user.php 2010-09-05 18:47:25 UTC (rev 15574)
</span><span class="lines">@@ -461,11 +461,7 @@
</span><span class="cx"> $meta_queries[] = $cap_meta_query;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $meta_query = array();
- foreach ( array( 'meta_key', 'meta_value', 'meta_compare' ) as $key )
- if ( isset( $qv[ $key ] ) )
- $meta_query[ $key ] = $qv[ $key ];
- $meta_queries[] = $meta_query;
</del><ins>+ $meta_queries[] = wp_array_slice_assoc( $qv, array( 'meta_key', 'meta_value', 'meta_compare' ) );
</ins><span class="cx">
</span><span class="cx"> $meta_query_sql = _wp_meta_sql( $meta_queries, 'user_id', $wpdb->usermeta );
</span><span class="cx">
</span><span class="lines">@@ -831,30 +827,8 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
- $query = "SELECT {$wpdb->users}.* FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities'";
</del><ins>+ $users = get_users( wp_array_slice_assoc( $args, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) ) );
</ins><span class="cx">
</span><del>- $query_where = array();
-
- if ( is_array($include) )
- $include = join(',', $include);
- $include = preg_replace('/[^0-9,]/', '', $include); // (int)
- if ( $include )
- $query_where[] = "ID IN ($include)";
-
- if ( is_array($exclude) )
- $exclude = join(',', $exclude);
- $exclude = preg_replace('/[^0-9,]/', '', $exclude); // (int)
- if ( $exclude )
- $query_where[] = "ID NOT IN ($exclude)";
-
- if ( $query_where )
- $query .= " AND " . join(' AND', $query_where);
-
- $query .= " ORDER BY $orderby $order";
-
- $users = $wpdb->get_results( $query );
-
</del><span class="cx"> $output = '';
</span><span class="cx"> if ( !empty($users) ) {
</span><span class="cx"> $name = esc_attr( $name );
</span></span></pre>
</div>
</div>
</body>
</html>