<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13726] trunk/wp-admin/includes/nav-menu.php:
Remove half-baked transient caching of nav-menu source results from [13704
].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13726">13726</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-03-17 06:10:47 +0000 (Wed, 17 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove half-baked transient caching of nav-menu source results from <a href="http://trac.wordpress.org/changeset/13704">[13704]</a>. Todo: reimplement with proper cache invalidation. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (13725 => 13726)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-03-17 04:39:50 UTC (rev 13725)
+++ trunk/wp-admin/includes/nav-menu.php 2010-03-17 06:10:47 UTC (rev 13726)
</span><span class="lines">@@ -23,9 +23,6 @@
</span><span class="cx"> continue;
</span><span class="cx"> $id = $post_type->name;
</span><span class="cx">
</span><del>- // delete_transient( "nav_menu_items_{$post_type->name}" );
- // delete_transient( "nav_menu_sub_items_{$post_type->name}" );
-
</del><span class="cx"> 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 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -47,9 +44,6 @@
</span><span class="cx"> continue;
</span><span class="cx"> $id = $tax->name;
</span><span class="cx">
</span><del>- // delete_transient( "nav_menu_items_{$tax->name}" );
- // delete_transient( "nav_menu_sub_items_{$tax->name}" );
-
</del><span class="cx"> add_meta_box( "add-{$id}", sprintf( __('Add an Existing %s'), $tax->singular_label ), 'wp_nav_menu_item_taxonomy_metabox', 'menus', 'side', 'default', $tax );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -106,12 +100,8 @@
</span><span class="cx"> function wp_nav_menu_item_link_metabox() {
</span><span class="cx"> $args = array( 'post_status' => 'any', 'post_type' => 'nav_menu_item', 'meta_value' => 'custom' );
</span><span class="cx">
</span><del>- // 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 );
- }
</del><ins>+ // @todo transient caching of these results with proper invalidation on updating links
+ $query = new WP_Query( $args );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> <p id="menu-item-url-wrap">
</span><span class="lines">@@ -160,12 +150,8 @@
</span><span class="cx"> if ( 'attachment' == $post_type['args']->name )
</span><span class="cx"> $args['post_status'] = 'any';
</span><span class="cx">
</span><del>- // 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 );
- }
</del><ins>+ // @todo transient caching of these results with proper invalidation on updating of a post of this type
+ $query = new WP_Query( $args );
</ins><span class="cx">
</span><span class="cx"> if ( !$query->posts )
</span><span class="cx"> $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'</li>';
</span><span class="lines">@@ -229,14 +215,10 @@
</span><span class="cx"> 'hide_empty' => false, 'include_last_update_time' => false, 'hierarchical' => 1, 'exclude' => '',
</span><span class="cx"> 'include' => '', 'number' => '', 'pad_counts' => false
</span><span class="cx"> );
</span><ins>+
+ // @todo transient caching of these results with proper invalidation on updating of a tax of this type
+ $terms = get_terms( $taxonomy['args']->name, $args );
</ins><span class="cx">
</span><del>- // 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 );
- }
-
</del><span class="cx"> if ( !$terms )
</span><span class="cx"> $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'</li>';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>