<!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>[13123] trunk/wp-includes/user.php: s/$blog/$blog_id/
as an argument in wp_dropdown_users(), for consistency, see #11086</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13123">13123</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-13 20:17:15 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/$blog/$blog_id/ as an argument in wp_dropdown_users(), for consistency, see <a href="http://trac.wordpress.org/ticket/11086">#11086</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 (13122 => 13123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-02-13 20:12:08 UTC (rev 13122)
+++ trunk/wp-includes/user.php 2010-02-13 20:17:15 UTC (rev 13123)
</span><span class="lines">@@ -507,7 +507,7 @@
</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="cx"> * <li>class - Class attribute of select element.</li>
</span><del>- * <li>blog - ID of blog (Multisite only). Defaults to ID of current blog.</li>
</del><ins>+ * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li>
</ins><span class="cx"> * </ol>
</span><span class="cx"> *
</span><span class="cx"> * @since 2.3.0
</span><span class="lines">@@ -517,13 +517,13 @@
</span><span class="cx"> * @return string|null Null on display. String of HTML content on retrieve.
</span><span class="cx"> */
</span><span class="cx"> function wp_dropdown_users( $args = '' ) {
</span><del>- global $wpdb, $blog_id;
</del><ins>+ global $wpdb;
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'show_option_all' => '', 'show_option_none' => '',
</span><span class="cx"> 'orderby' => 'display_name', 'order' => 'ASC',
</span><span class="cx"> 'include' => '', 'exclude' => '', 'multi' => 0,
</span><span class="cx"> 'show' => 'display_name', 'echo' => 1,
</span><del>- 'selected' => 0, 'name' => 'user', 'class' => '', 'blog' => $blog_id,
</del><ins>+ 'selected' => 0, 'name' => 'user', 'class' => '', 'blog_id' => $GLOBALS['blog_id'],
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
</span><span class="lines">@@ -531,7 +531,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>- $blog_prefix = $wpdb->get_blog_prefix( $blog );
</del><ins>+ $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
</ins><span class="cx"> $query = "SELECT {$wpdb->users}.* FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities'";
</span><span class="cx">
</span><span class="cx"> $query_where = array();
</span></span></pre>
</div>
</div>
</body>
</html>