<!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>[22234] trunk/wp-admin/includes/nav-menu.php: In nav menus, avoid firing the magic WP_Post getter for potentially non-existent properties, which results in a metadata cache hit.</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/22234">22234</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-15 14:19:45 +0000 (Mon, 15 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>In nav menus, avoid firing the magic WP_Post getter for potentially non-existent properties, which results in a metadata cache hit. see <a href="http://core.trac.wordpress.org/ticket/22189">#22189</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 (22233 => 22234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2012-10-15 14:17:50 UTC (rev 22233)
+++ trunk/wp-admin/includes/nav-menu.php 2012-10-15 14:19:45 UTC (rev 22234)
</span><span class="lines">@@ -247,11 +247,12 @@
</span><span class="cx"> $output .= $indent . '<li>';
</span><span class="cx"> $output .= '<label class="menu-item-title">';
</span><span class="cx"> $output .= '<input type="checkbox" class="menu-item-checkbox';
</span><del>- if ( ! empty( $item->_add_to_top ) ) {
</del><ins>+ if ( property_exists( $item, 'front_or_home' ) && $item->front_or_home ) {
+ $title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $item->post_title );
</ins><span class="cx"> $output .= ' add-to-top';
</span><span class="cx"> }
</span><span class="cx"> $output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
</span><del>- $output .= empty( $item->label ) ? esc_html( $item->title ) : esc_html( $item->label );
</del><ins>+ $output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
</ins><span class="cx"> $output .= '</label>';
</span><span class="cx">
</span><span class="cx"> // Menu item hidden fields
</span><span class="lines">@@ -727,13 +728,12 @@
</span><span class="cx"> $front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
</span><span class="cx"> if ( ! empty( $front_page ) ) {
</span><span class="cx"> $front_page_obj = get_post( $front_page );
</span><del>- $front_page_obj->_add_to_top = true;
- $front_page_obj->label = sprintf( _x('Home: %s', 'nav menu front page title'), $front_page_obj->post_title );
</del><ins>+ $front_page_obj->front_or_home = true;
</ins><span class="cx"> array_unshift( $posts, $front_page_obj );
</span><span class="cx"> } else {
</span><span class="cx"> $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
</span><span class="cx"> array_unshift( $posts, (object) array(
</span><del>- '_add_to_top' => true,
</del><ins>+ 'front_or_home' => true,
</ins><span class="cx"> 'ID' => 0,
</span><span class="cx"> 'object_id' => $_nav_menu_placeholder,
</span><span class="cx"> 'post_content' => '',
</span></span></pre>
</div>
</div>
</body>
</html>