<!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>[15567] trunk: fix wp_getAuthors in xmlrpc.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15567">15567</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-05 14:49:52 +0000 (Sun, 05 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix wp_getAuthors in xmlrpc.php. See <a href="http://trac.wordpress.org/ticket/14572">#14572</a> and <a href="http://trac.wordpress.org/changeset/15566">[15566]</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpincludesauthortemplatephp">trunk/wp-includes/author-template.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (15566 => 15567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-09-05 14:35:55 UTC (rev 15566)
+++ trunk/wp-admin/includes/schema.php 2010-09-05 14:49:52 UTC (rev 15567)
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $site_admins = array( $site_user->user_login );
</span><del>- $users = get_users_of_blog();
</del><ins>+ $users = get_users();
</ins><span class="cx"> if ( $users ) {
</span><span class="cx"> foreach ( $users as $user ) {
</span><span class="cx"> if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
</span></span></pre></div>
<a id="trunkwpincludesauthortemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/author-template.php (15566 => 15567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/author-template.php 2010-09-05 14:35:55 UTC (rev 15566)
+++ trunk/wp-includes/author-template.php 2010-09-05 14:49:52 UTC (rev 15567)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> $return = '';
</span><span class="cx">
</span><span class="cx"> /** @todo Move select to get_authors(). */
</span><del>- $users = get_users_of_blog();
</del><ins>+ $users = get_users();
</ins><span class="cx"> $author_ids = array();
</span><span class="cx"> foreach ( (array) $users as $user )
</span><span class="cx"> $author_ids[] = $user->user_id;
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15566 => 15567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-09-05 14:35:55 UTC (rev 15566)
+++ trunk/wp-includes/user.php 2010-09-05 14:49:52 UTC (rev 15567)
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> * @return array List of users that are part of that Blog ID
</span><span class="cx"> */
</span><span class="cx"> function get_users_of_blog( $id = '' ) {
</span><del>- global $wpdb, $blog_id;
</del><ins>+ global $blog_id;
</ins><span class="cx">
</span><span class="cx"> if ( empty($id) )
</span><span class="cx"> $id = (int) $blog_id;
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (15566 => 15567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2010-09-05 14:35:55 UTC (rev 15566)
+++ trunk/xmlrpc.php 2010-09-05 14:49:52 UTC (rev 15567)
</span><span class="lines">@@ -834,15 +834,15 @@
</span><span class="cx"> do_action('xmlrpc_call', 'wp.getAuthors');
</span><span class="cx">
</span><span class="cx"> $authors = array();
</span><del>- foreach ( (array) get_users_of_blog() as $row ) {
</del><ins>+ foreach ( get_users() as $user_id => $user_object ) {
</ins><span class="cx"> $authors[] = array(
</span><del>- "user_id" => $row->user_id,
- "user_login" => $row->user_login,
- "display_name" => $row->display_name
</del><ins>+ "user_id" => $user_id,
+ "user_login" => $user_object->user_login,
+ "display_name" => $user_object->display_name
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return($authors);
</del><ins>+ return $authors;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>