<!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" />
<title>[22235] trunk/wp-includes/nav-menu.php: Optimize wp_update_nav_menu_item() for high performance.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22235">22235</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-15 14:27:16 +0000 (Mon, 15 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Optimize wp_update_nav_menu_item() for high performance. Only query items for a menu when we need them. Update items after updating its meta so the meta cache can be leveraged. see <a href="http://core.trac.wordpress.org/ticket/22189">#22189</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (22234 => 22235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2012-10-15 14:19:45 UTC (rev 22234)
+++ trunk/wp-includes/nav-menu.php 2012-10-15 14:27:16 UTC (rev 22235)
</span><span class="lines">@@ -279,10 +279,6 @@
</span><span class="cx"> if ( ( ! $menu && 0 !== $menu_id ) || is_wp_error( $menu ) )
</span><span class="cx"> return $menu;
</span><span class="cx">
</span><del>- $menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-
- $count = count( $menu_items );
-
</del><span class="cx"> $defaults = array(
</span><span class="cx"> 'menu-item-db-id' => $menu_item_db_id,
</span><span class="cx"> 'menu-item-object-id' => 0,
</span><span class="lines">@@ -305,8 +301,9 @@
</span><span class="cx"> if ( 0 == $menu_id ) {
</span><span class="cx"> $args['menu-item-position'] = 1;
</span><span class="cx"> } elseif ( 0 == (int) $args['menu-item-position'] ) {
</span><ins>+ $menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
</ins><span class="cx"> $last_item = array_pop( $menu_items );
</span><del>- $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : $count;
</del><ins>+ $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : count( $menu_items );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $original_parent = 0 < $menu_item_db_id ? get_post_field( 'post_parent', $menu_item_db_id ) : 0;
</span><span class="lines">@@ -350,20 +347,18 @@
</span><span class="cx"> 'post_type' => 'nav_menu_item',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( 0 != $menu_id )
</del><ins>+ if ( $menu_id && ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) )
</ins><span class="cx"> $post['tax_input'] = array( 'nav_menu' => array( intval( $menu->term_id ) ) );
</span><span class="cx">
</span><ins>+ $update = 0 != $menu_item_db_id;
+
</ins><span class="cx"> // New menu item. Default is draft status
</span><del>- if ( 0 == $menu_item_db_id ) {
</del><ins>+ if ( ! $update ) {
</ins><span class="cx"> $post['ID'] = 0;
</span><span class="cx"> $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
</span><span class="cx"> $menu_item_db_id = wp_insert_post( $post );
</span><del>-
- // Update existing menu item. Default is publish status
- } else {
- $post['ID'] = $menu_item_db_id;
- $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
- wp_update_post( $post );
</del><ins>+ if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) )
+ return $menu_item_db_id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'custom' == $args['menu-item-type'] ) {
</span><span class="lines">@@ -371,14 +366,11 @@
</span><span class="cx"> $args['menu-item-object'] = 'custom';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) )
- return $menu_item_db_id;
-
</del><span class="cx"> $menu_item_db_id = (int) $menu_item_db_id;
</span><span class="cx">
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key($args['menu-item-type']) );
</span><del>- update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', (int) $args['menu-item-parent-id'] );
- update_post_meta( $menu_item_db_id, '_menu_item_object_id', (int) $args['menu-item-object-id'] );
</del><ins>+ update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', strval( (int) $args['menu-item-parent-id'] ) );
+ update_post_meta( $menu_item_db_id, '_menu_item_object_id', strval( (int) $args['menu-item-object-id'] ) );
</ins><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) );
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) );
</span><span class="cx">
</span><span class="lines">@@ -389,10 +381,17 @@
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) );
</span><span class="cx">
</span><span class="cx"> if ( 0 == $menu_id )
</span><del>- update_post_meta( $menu_item_db_id, '_menu_item_orphaned', time() );
- else
</del><ins>+ update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
+ elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) )
</ins><span class="cx"> delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );
</span><span class="cx">
</span><ins>+ // Update existing menu item. Default is publish status
+ if ( $update ) {
+ $post['ID'] = $menu_item_db_id;
+ $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
+ wp_update_post( $post );
+ }
+
</ins><span class="cx"> do_action('wp_update_nav_menu_item', $menu_id, $menu_item_db_id, $args );
</span><span class="cx">
</span><span class="cx"> return $menu_item_db_id;
</span></span></pre>
</div>
</div>
</body>
</html>