<!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>[13491] trunk: Use get_terms() in wp_count_terms().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13491">13491</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-28 07:37:24 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use get_terms() in wp_count_terms(). Props scribu. Fixes <a href="http://trac.wordpress.org/ticket/10746">#10746</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (13490 => 13491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-02-28 07:15:15 UTC (rev 13490)
+++ trunk/wp-admin/edit-tags.php 2010-02-28 07:37:24 UTC (rev 13491)
</span><span class="lines">@@ -230,20 +230,14 @@
</span><span class="cx"> $tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( !empty($_GET['s']) ) {
- $searchterms = trim(stripslashes($_GET['s']));
- $total_terms = count( get_terms( $taxonomy, array( 'search' => $searchterms, 'number' => 0, 'hide_empty' => 0 ) ) );
-} else {
- $searchterms = '';
- $total_terms = wp_count_terms($taxonomy);
-}
</del><ins>+$searchterms = !empty($_GET['s']) ? trim(stripslashes($_GET['s'])) : '';
</ins><span class="cx">
</span><span class="cx"> $page_links = paginate_links( array(
</span><span class="cx"> 'base' => add_query_arg( 'pagenum', '%#%' ),
</span><span class="cx"> 'format' => '',
</span><span class="cx"> 'prev_text' => __('&laquo;'),
</span><span class="cx"> 'next_text' => __('&raquo;'),
</span><del>- 'total' => ceil($total_terms / $tags_per_page),
</del><ins>+ 'total' => ceil(wp_count_terms($taxonomy, array('search' => $searchterms)) / $tags_per_page),
</ins><span class="cx"> 'current' => $pagenum
</span><span class="cx"> ));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (13490 => 13491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-02-28 07:15:15 UTC (rev 13490)
+++ trunk/wp-includes/taxonomy.php 2010-02-28 07:37:24 UTC (rev 13491)
</span><span class="lines">@@ -871,16 +871,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $selects = array();
</span><del>- if ( 'all' == $fields )
- $selects = array('t.*', 'tt.*');
- else if ( 'ids' == $fields || 'id=>parent' == $fields )
- $selects = array('t.term_id', 'tt.parent', 'tt.count');
- else if ( 'names' == $fields )
- $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
</del><ins>+ switch ( $fields ) {
+ case 'all':
+ $selects = array('t.*', 'tt.*');
+ break;
+ case 'ids':
+ case 'id=>parent':
+ $selects = array('t.term_id', 'tt.parent', 'tt.count');
+ break;
+ case 'names':
+ $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
+ break;
+ case 'count':
+ $selects = array('COUNT(*)');
+ }
</ins><span class="cx"> $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
</span><span class="cx">
</span><span class="cx"> $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where ORDER BY $orderby $order $limit";
</span><span class="cx">
</span><ins>+ if ( 'count' == $fields ) {
+ $term_count = $wpdb->get_var($query);
+ return $term_count;
+ }
+
</ins><span class="cx"> $terms = $wpdb->get_results($query);
</span><span class="cx"> if ( 'all' == $fields ) {
</span><span class="cx"> update_term_cache($terms);
</span><span class="lines">@@ -1130,32 +1143,32 @@
</span><span class="cx"> /**
</span><span class="cx"> * Count how many terms are in Taxonomy.
</span><span class="cx"> *
</span><del>- * Default $args is 'ignore_empty' which can be <code>'ignore_empty=true'</code>
- * or <code>array('ignore_empty' => true);</code>.
</del><ins>+ * Default $args is 'hide_empty' which can be 'hide_empty=true' or array('hide_empty' => true).
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Taxonomy
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> *
</span><del>- * @uses $wpdb
</del><ins>+ * @uses get_terms()
</ins><span class="cx"> * @uses wp_parse_args() Turns strings into arrays and merges defaults into an array.
</span><span class="cx"> *
</span><span class="cx"> * @param string $taxonomy Taxonomy name
</span><del>- * @param array|string $args Overwrite defaults
</del><ins>+ * @param array|string $args Overwrite defaults. See get_terms()
</ins><span class="cx"> * @return int How many terms are in $taxonomy
</span><span class="cx"> */
</span><span class="cx"> function wp_count_terms( $taxonomy, $args = array() ) {
</span><del>- global $wpdb;
-
- $defaults = array('ignore_empty' => false);
</del><ins>+ $defaults = array('hide_empty' => false);
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><del>- extract($args, EXTR_SKIP);
</del><span class="cx">
</span><del>- $where = '';
- if ( $ignore_empty )
- $where = 'AND count > 0';
</del><ins>+ // backwards compatibility
+ if ( isset($args['ignore_empty']) ) {
+ $args['hide_empty'] = $args['ignore_empty'];
+ unset($args['ignore_empty']);
+ }
</ins><span class="cx">
</span><del>- return $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE taxonomy = %s $where", $taxonomy) );
</del><ins>+ $args['fields'] = 'count';
+
+ return get_terms($taxonomy, $args);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>