<!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>[14569] trunk/wp-admin/includes/nav-menu.php: Don't wp_count_terms().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14569">14569</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-11 18:55:12 +0000 (Tue, 11 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't wp_count_terms(). Just count the results returned from get_terms(), which has to run anyway. see <a href="http://trac.wordpress.org/ticket/12734">#12734</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (14568 => 14569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-05-11 18:43:12 UTC (rev 14568)
+++ trunk/wp-admin/includes/nav-menu.php 2010-05-11 18:55:12 UTC (rev 14569)
</span><span class="lines">@@ -661,10 +661,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
</span><span class="cx"> $taxonomy_name = $taxonomy['args']->name;
</span><del>- if ( ! $term_count = wp_count_terms( $taxonomy_name ) ) {
- echo '<p>' . __( 'No items.' ) . '</p>';
- return;
- }
</del><ins>+
</ins><span class="cx"> // paginate browsing for large numbers of objects
</span><span class="cx"> $per_page = 50;
</span><span class="cx"> $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</span><span class="lines">@@ -684,8 +681,15 @@
</span><span class="cx"> 'pad_counts' => false,
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $num_pages = ceil( $term_count / $per_page );
</del><ins>+ $terms = get_terms( $taxonomy_name, $args );
</ins><span class="cx">
</span><ins>+ if ( ! $terms || is_wp_error($terms) ) {
+ echo '<p>' . __( 'No items.' ) . '</p>';
+ return;
+ }
+
+ $num_pages = ceil( count($terms) / $per_page );
+
</ins><span class="cx"> $page_links = paginate_links( array(
</span><span class="cx"> 'base' => add_query_arg(
</span><span class="cx"> array(
</span><span class="lines">@@ -701,12 +705,7 @@
</span><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> $walker = new Walker_Nav_Menu_Checklist;
</span><del>- // @todo transient caching of these results with proper invalidation on updating of a tax of this type
- $terms = get_terms( $taxonomy_name, $args );
</del><span class="cx">
</span><del>- if ( ! $terms || is_wp_error($terms) )
- $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'</li>';
-
</del><span class="cx"> $current_tab = 'most-used';
</span><span class="cx"> if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) {
</span><span class="cx"> $current_tab = $_REQUEST[$taxonomy_name . '-tab'];
</span></span></pre>
</div>
</div>
</body>
</html>