<!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>[16916] trunk/wp-includes/user.php: Honor defaults in wp_dropdown_users().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16916">16916</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-14 16:19:08 +0000 (Tue, 14 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Honor defaults in wp_dropdown_users(). Props duck_. fixes <a href="http://trac.wordpress.org/ticket/15791">#15791</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16915 => 16916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-12-14 15:45:19 UTC (rev 16915)
+++ trunk/wp-includes/user.php 2010-12-14 16:19:08 UTC (rev 16916)
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> // sorting
</span><span class="cx"> if ( in_array( $qv['orderby'], array('email', 'url', 'registered') ) ) {
</span><span class="cx"> $orderby = 'user_' . $qv['orderby'];
</span><del>- } elseif ( 'name' == $qv['orderby'] ) {
</del><ins>+ } elseif ( 'name' == $qv['orderby'] || 'display_name' == $qv['orderby'] ) {
</ins><span class="cx"> $orderby = 'display_name';
</span><span class="cx"> } elseif ( 'post_count' == $qv['orderby'] ) {
</span><span class="cx"> $where = get_posts_by_author_sql('post');
</span><span class="lines">@@ -928,15 +928,13 @@
</span><span class="cx"> * The available arguments are as follows:
</span><span class="cx"> * <ol>
</span><span class="cx"> * <li>show_option_all - Text to show all and whether HTML option exists.</li>
</span><del>- * <li>show_option_none - Text for show none and whether HTML option exists.
- * </li>
- * <li>orderby - SQL order by clause for what order the users appear. Default is
- * 'display_name'.</li>
</del><ins>+ * <li>show_option_none - Text for show none and whether HTML option exists.</li>
+ * <li>orderby - SQL order by clause for what order the users appear. Default is 'display_name'.</li>
</ins><span class="cx"> * <li>order - Default is 'ASC'. Can also be 'DESC'.</li>
</span><span class="cx"> * <li>include - User IDs to include.</li>
</span><span class="cx"> * <li>exclude - User IDs to exclude.</li>
</span><span class="cx"> * <li>multi - Default is 'false'. Whether to skip the ID attribute on the 'select' element. A 'true' value is overridden when id argument is set.</li>
</span><del>- * <li>show - Default is 'display_name'. User table column to display. If the selected item is empty then the user_login will be displayed in parentesis</li>
</del><ins>+ * <li>show - Default is 'display_name'. User table column to display. If the selected item is empty then the user_login will be displayed in parentheses</li>
</ins><span class="cx"> * <li>echo - Default is '1'. Whether to display or retrieve content.</li>
</span><span class="cx"> * <li>selected - Which User ID is selected.</li>
</span><span class="cx"> * <li>name - Default is 'user'. Name attribute of select element.</li>
</span><span class="lines">@@ -967,7 +965,7 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- $users = get_users( wp_array_slice_assoc( $args, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) ) );
</del><ins>+ $users = get_users( wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order' ) ) );
</ins><span class="cx">
</span><span class="cx"> $output = '';
</span><span class="cx"> if ( !empty($users) ) {
</span></span></pre>
</div>
</div>
</body>
</html>