Changeset 13491

Timestamp:

02/28/2010 07:37:24 AM (15 years ago)

Author:

dd32

Message:

Use get_terms() in wp_count_terms(). Props scribu. Fixes #10746

Location:

trunk

Files:

• wp-admin/edit-tags.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-admin/edit-tags.php

@@ -231 +231 @@
 }
 
-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);
-}
+$searchterms = !empty($_GET['s']) ? trim(stripslashes($_GET['s'])) : '';
 
 $page_links = paginate_links( array(
@@ -244 +238 @@
     'prev_text' => __('«'),
     'next_text' => __('»'),
-    'total' => ceil($total_terms / $tags_per_page),
+    'total' => ceil(wp_count_terms($taxonomy, array('search' => $searchterms)) / $tags_per_page),
     'current' => $pagenum
 ));

trunk/wp-includes/taxonomy.php

@@ -872 +872 @@
 
     $selects = array();
-    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');
+    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(*)');
+    }
     $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
 
     $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";
+
+    if ( 'count' == $fields ) {
+        $term_count = $wpdb->get_var($query);
+        return $term_count;
+    }
 
     $terms = $wpdb->get_results($query);
@@ -1131 +1144 @@
  * Count how many terms are in Taxonomy.
  *
- * Default $args is 'ignore_empty' which can be <code>'ignore_empty=true'</code>
- * or <code>array('ignore_empty' => true);</code>.
- *
- * @package WordPress
- * @subpackage Taxonomy
- * @since 2.3.0
- *
- * @uses $wpdb
+ * Default $args is 'hide_empty' which can be 'hide_empty=true' or array('hide_empty' => true).
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 2.3.0
+ *
+ * @uses get_terms()
  * @uses wp_parse_args() Turns strings into arrays and merges defaults into an array.
  *
  * @param string $taxonomy Taxonomy name
- * @param array|string $args Overwrite defaults
+ * @param array|string $args Overwrite defaults. See get_terms()
  * @return int How many terms are in $taxonomy
  */
 function wp_count_terms( $taxonomy, $args = array() ) {
-    global $wpdb;
-
-    $defaults = array('ignore_empty' => false);
+    $defaults = array('hide_empty' => false);
     $args = wp_parse_args($args, $defaults);
-    extract($args, EXTR_SKIP);
-
-    $where = '';
-    if ( $ignore_empty )
-        $where = 'AND count > 0';
-
-    return $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE taxonomy = %s $where", $taxonomy) );
+
+    // backwards compatibility
+    if ( isset($args['ignore_empty']) ) {
+        $args['hide_empty'] = $args['ignore_empty'];
+        unset($args['ignore_empty']);
+    }
+
+    $args['fields'] = 'count';
+
+    return get_terms($taxonomy, $args);
 }