<!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>[13198] trunk: Don't include internal post types in the total.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13198">13198</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-18 20:01:10 +0000 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't include internal post types in the total. see <a href="http://trac.wordpress.org/ticket/9674">#9674</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (13197 => 13198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-02-18 19:43:44 UTC (rev 13197)
+++ trunk/wp-admin/edit.php 2010-02-18 20:01:10 UTC (rev 13198)
</span><span class="lines">@@ -228,7 +228,12 @@
</span><span class="cx"> $allposts = '&all_posts=1';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$total_posts = array_sum( (array) $num_posts ) - $num_posts->trash;
</del><ins>+$total_posts = array_sum( (array) $num_posts );
+
+// Subtract post types that are not included in the admin all list.
+foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state )
+ $total_posts -= $num_posts->$state;
+
</ins><span class="cx"> $class = empty($class) && empty($_GET['post_status']) ? ' class="current"' : '';
</span><span class="cx"> $status_links[] = "<li><a href='edit.php?post_type=$post_type{$allposts}'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13197 => 13198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-18 19:43:44 UTC (rev 13197)
+++ trunk/wp-includes/post.php 2010-02-18 20:01:10 UTC (rev 13198)
</span><span class="lines">@@ -1425,10 +1425,9 @@
</span><span class="cx">
</span><span class="cx"> $count = $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
</span><span class="cx">
</span><del>- $stats = array( 'publish' => 0, 'private' => 0, 'draft' => 0, 'pending' => 0, 'future' => 0, 'trash' => 0 );
- foreach( (array) $count as $row_num => $row ) {
</del><ins>+ $stats = array_fill_keys( get_post_stati(), 0);
+ foreach ( (array) $count as $row_num => $row )
</ins><span class="cx"> $stats[$row['post_status']] = $row['num_posts'];
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $stats = (object) $stats;
</span><span class="cx"> wp_cache_set($cache_key, $stats, 'counts');
</span></span></pre>
</div>
</div>
</body>
</html>