Ticket #11511: 11511.3.patch

wp-includes/taxonomy.php

@@ -1071 +1071 @@
 function wp_count_terms( $taxonomy, $args = array() ) {
         global $wpdb;
 
-        $defaults = array('ignore_empty' => false);
+        $defaults = array('ignore_empty' => false, 'search' => '');
         $args = wp_parse_args($args, $defaults);
         extract($args, EXTR_SKIP);
 
         $where = '';
+        $join = '';
+        if ( ! empty( $search ) ) {
+                $search = like_escape( $search );
+                $join = "INNER JOIN $wpdb->terms AS t ON t.term_id = tt.term_id AND t.name LIKE '%%{$search}%%'";
+        }
+        
         if ( $ignore_empty )
-                $where = 'AND count > 0';
+                $where .= 'AND count > 0';
 
-        return $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE taxonomy = %s $where", $taxonomy) );
+        return $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy AS tt $join WHERE taxonomy = %s $where", $taxonomy) );
 }
 
 /**

wp-admin/edit-tags.php

@@ -200 +200 @@
 $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
 $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
 
+$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '';
+
 $page_links = paginate_links( array(
         'base' => add_query_arg( 'pagenum', '%#%' ),
         'format' => '',
         'prev_text' => __('«'),
         'next_text' => __('»'),
-        'total' => ceil(wp_count_terms($taxonomy) / $tags_per_page),
+        'total' => ceil( wp_count_terms( $taxonomy, array( 'search' => $searchterms ) ) / $tags_per_page ),
         'current' => $pagenum
 ));
 
@@ -243 +245 @@
         <tbody id="the-list" class="list:tag">
 <?php
 
-$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '';
-
 $count = tag_rows( $pagenum, $tags_per_page, $searchterms, $taxonomy );
 ?>
         </tbody>