Changeset 13726

Timestamp:

03/17/2010 06:10:47 AM (15 years ago)

Author:

markjaquith

Message:

Remove half-baked transient caching of nav-menu source results from [13704]. Todo: reimplement with proper cache invalidation. see #11817

File:

• trunk/wp-admin/includes/nav-menu.php (modified) (5 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -24 +24 @@
         $id = $post_type->name;
 
-        // delete_transient( "nav_menu_items_{$post_type->name}" );
-        // delete_transient( "nav_menu_sub_items_{$post_type->name}" );
-        
         add_meta_box( "add-{$id}", sprintf( __('Add an Existing %s'), $post_type->singular_label ), 'wp_nav_menu_item_post_type_metabox', 'menus', 'side', 'default', $post_type );
     }
@@ -47 +44 @@
             continue;
         $id = $tax->name;
-
-        // delete_transient( "nav_menu_items_{$tax->name}" );
-        // delete_transient( "nav_menu_sub_items_{$tax->name}" );
 
         add_meta_box( "add-{$id}", sprintf( __('Add an Existing %s'), $tax->singular_label ), 'wp_nav_menu_item_taxonomy_metabox', 'menus', 'side', 'default', $tax );
@@ -107 +101 @@
     $args = array( 'post_status' => 'any', 'post_type' => 'nav_menu_item', 'meta_value' => 'custom' );  
     
-    // Cache the query for a day. @todo: Make sure to flush transient when links are updated.
-    $query = get_transient( 'menu_item_query_custom_links' );
-    if ( false == $query ) {
-        $query = new WP_Query( $args );
-        set_transient( 'menu_item_query_custom_links', $query, 86400 );
-    }
+    // @todo transient caching of these results with proper invalidation on updating links
+    $query = new WP_Query( $args );
     
     ?>
@@ -161 +151 @@
         $args['post_status'] = 'any';
     
-    // Cache the query for a day. @todo: Make sure to flush transient when objects are updated.
-    $query = get_transient( "nav_menu_items_{$post_type['args']->name}" );
-    if ( false == $query ) {
-        $query = new WP_Query( $args );
-        set_transient( "nav_menu_items_{$post_type['args']->name}", $query, 86400 );
-    }
+    // @todo transient caching of these results with proper invalidation on updating of a post of this type
+    $query = new WP_Query( $args );
     
     if ( !$query->posts )
@@ -230 +216 @@
         'include' => '', 'number' => '', 'pad_counts' => false
     );
-    
-    // Cache the query for a day. @todo: Make sure to flush transient when terms are updated.
-    $terms = get_transient( "nav_menu_items_{$taxonomy['args']->name}" );
-    if ( false == $terms ) {
-        $terms = get_terms( $taxonomy['args']->name, $args );
-        set_transient( "nav_menu_items_{$taxonomy['args']->name}", $terms, 86400 );
-    }
+
+    // @todo transient caching of these results with proper invalidation on updating of a tax of this type
+    $terms = get_terms( $taxonomy['args']->name, $args );
     
     if ( !$terms )