Changeset 11140

Timestamp:

04/30/2009 04:51:45 PM (16 years ago)

Author:

ryan

Message:

Fix category search pagination. Fix caching of empty term results. Props Denis-de-Bernardy. fixes #8632

Location:

trunk

Files:

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

trunk/wp-admin/categories.php

@@ -167 +167 @@
 $cats_per_page = apply_filters('edit_categories_per_page', $cats_per_page);
 
+if ( !empty($_GET['s']) )
+    $num_cats = count(get_categories(array('hide_empty' => 0, 'search' => $_GET['s'])));
+else
+    $num_cats = wp_count_terms('category');
+
 $page_links = paginate_links( array(
     'base' => add_query_arg( 'pagenum', '%#%' ),
@@ -172 +177 @@
     'prev_text' => __('«'),
     'next_text' => __('»'),
-    'total' => ceil(wp_count_terms('category') / $cats_per_page),
+    'total' => ceil($num_cats / $cats_per_page),
     'current' => $pagenum
 ));

trunk/wp-includes/taxonomy.php

@@ -663 +663 @@
     }
     $cache_key = "get_terms:$key:$last_changed";
-
-    if ( $cache = wp_cache_get( $cache_key, 'terms' ) ) {
-        $terms = apply_filters('get_terms', $cache, $taxonomies, $args);
-        return $terms;
+    $cache = wp_cache_get( $cache_key, 'terms' );
+    if ( false !== $cache ) {
+        $cache = apply_filters('get_terms', $cache, $taxonomies, $args);
+        return $cache;
     }
 
@@ -781 +781 @@
 
     if ( empty($terms) ) {
-        $cache[ $key ] = array();
-        wp_cache_set( 'get_terms', $cache, 'terms' );
+        wp_cache_add( $cache_key, array(), 'terms' );
         $terms = apply_filters('get_terms', array(), $taxonomies, $args);
         return $terms;