<!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>[13617] trunk: Fix warning in users.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13617">13617</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-08 14:30:17 +0000 (Mon, 08 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix warning in users.php. Fixes <a href="http://trac.wordpress.org/ticket/12555">#12555</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (13616 => 13617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-03-07 02:51:55 UTC (rev 13616)
+++ trunk/wp-admin/users.php 2010-03-08 14:30:17 UTC (rev 13617)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> $role = array_shift($roles);
</span><span class="cx">
</span><span class="cx"> $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
</span><del>- echo "\n\t", user_row($user_object, $style, $role, $post_counts[(string)$userid]);
</del><ins>+ echo "\n\t", user_row($user_object, $style, $role, isset( $post_counts[ $userid ] ) ? $post_counts[ $userid ] : 0 );
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </tbody>
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (13616 => 13617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-03-07 02:51:55 UTC (rev 13616)
+++ trunk/wp-includes/user.php 2010-03-08 14:30:17 UTC (rev 13617)
</span><span class="lines">@@ -167,24 +167,26 @@
</span><span class="cx"> */
</span><span class="cx"> function count_many_users_posts($users) {
</span><span class="cx"> global $wpdb;
</span><del>-
- if (0 == count($users))
- return array();
-
- $userlist = implode(',', $users);
- $where = get_posts_by_author_sql('post');
</del><span class="cx">
</span><ins>+ $count = array();
+ if ( ! count( $users ) )
+ return $count;
+
+ $userlist = implode( ',', $users );
+ $where = get_posts_by_author_sql( 'post' );
+
</ins><span class="cx"> $result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );
</span><span class="cx">
</span><del>- $count = array();
- foreach($result as $row) {
- $count[$row[0]] = $row[1];
</del><ins>+ if ( ! $result )
+ return $count;
+
+ foreach ( $result as $row ) {
+ $count[ $row[0] ] = $row[1];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- foreach($users as $id) {
- $id = (string) $id;
- if (!isset($count[$id]))
- $count[$id] = 0;
</del><ins>+ foreach ( $users as $id ) {
+ if ( ! isset( $count[ $id ] ) )
+ $count[ $id ] = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $count;
</span></span></pre>
</div>
</div>
</body>
</html>