Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-04 18:01:42 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-03-17 06:10:47 +00:00
parent 58d47426cc
commit 411734437a
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-admin/includes/nav-menu.php
View File

@ -23,9 +23,6 @@ function wp_nav_menu_post_type_metaboxes() {
continue; continue;
$id = $post_type->name; $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 ); 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,9 +44,6 @@ function wp_nav_menu_taxonomy_metaboxes() {
continue; continue;
$id = $tax->name; $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 ); add_meta_box( "add-{$id}", sprintf( __('Add an Existing %s'), $tax->singular_label ), 'wp_nav_menu_item_taxonomy_metabox', 'menus', 'side', 'default', $tax );
} }
} }
@ -106,12 +100,8 @@ function wp_nav_menu_create_metabox() { ?>
function wp_nav_menu_item_link_metabox() { function wp_nav_menu_item_link_metabox() {
$args = array( 'post_status' => 'any', 'post_type' => 'nav_menu_item', 'meta_value' => 'custom' ); $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. // @todo transient caching of these results with proper invalidation on updating links
$query = get_transient( 'menu_item_query_custom_links' ); $query = new WP_Query( $args );
if ( false == $query ) {
$query = new WP_Query( $args );
set_transient( 'menu_item_query_custom_links', $query, 86400 );
}
?> ?>
<p id="menu-item-url-wrap"> <p id="menu-item-url-wrap">
@ -160,12 +150,8 @@ function wp_nav_menu_item_post_type_metabox( $object, $post_type ) {
if ( 'attachment' == $post_type['args']->name ) if ( 'attachment' == $post_type['args']->name )
$args['post_status'] = 'any'; $args['post_status'] = 'any';
// Cache the query for a day. @todo: Make sure to flush transient when objects are updated. // @todo transient caching of these results with proper invalidation on updating of a post of this type
$query = get_transient( "nav_menu_items_{$post_type['args']->name}" ); $query = new WP_Query( $args );
if ( false == $query ) {
$query = new WP_Query( $args );
set_transient( "nav_menu_items_{$post_type['args']->name}", $query, 86400 );
}
if ( !$query->posts ) if ( !$query->posts )
$error = '<li id="error">'. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'</li>'; $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'</li>';
@ -229,13 +215,9 @@ function wp_nav_menu_item_taxonomy_metabox( $object, $taxonomy ) {
'hide_empty' => false, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '', 'hide_empty' => false, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '',
'include' => '', 'number' => '', 'pad_counts' => false 'include' => '', 'number' => '', 'pad_counts' => false
); );
// Cache the query for a day. @todo: Make sure to flush transient when terms are updated. // @todo transient caching of these results with proper invalidation on updating of a tax of this type
$terms = get_transient( "nav_menu_items_{$taxonomy['args']->name}" ); $terms = get_terms( $taxonomy['args']->name, $args );
if ( false == $terms ) {
$terms = get_terms( $taxonomy['args']->name, $args );
set_transient( "nav_menu_items_{$taxonomy['args']->name}", $terms, 86400 );
}
if ( !$terms ) if ( !$terms )
$error = '<li id="error">'. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'</li>'; $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'</li>';