<!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>[14937] trunk/wp-includes/nav-menu.php:
Ensure auto-added pages are both published and sent to the end of the menu
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14937">14937</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-26 06:59:14 +0000 (Wed, 26 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure auto-added pages are both published and sent to the end of the menu. Tiny enhancement and optimization to wp_update_nav_menu_item come with it. fixes <a href="http://trac.wordpress.org/ticket/13447">#13447</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 (14936 => 14937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-05-26 05:37:34 UTC (rev 14936)
+++ trunk/wp-includes/nav-menu.php 2010-05-26 06:59:14 UTC (rev 14937)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> return $menu;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $menu_items = (array) wp_get_nav_menu_items( $menu_id );
</del><ins>+ $menu_items = (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
</ins><span class="cx">
</span><span class="cx"> $count = count( $menu_items );
</span><span class="cx">
</span><span class="lines">@@ -286,21 +286,14 @@
</span><span class="cx"> 'menu-item-target' => '',
</span><span class="cx"> 'menu-item-classes' => '',
</span><span class="cx"> 'menu-item-xfn' => '',
</span><ins>+ 'menu-item-status' => '',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $menu_item_data, $defaults );
</span><span class="cx">
</span><span class="cx"> if ( 0 == (int) $args['menu-item-position'] ) {
</span><span class="cx"> $last_item = array_pop( $menu_items );
</span><del>- if ( $last_item && isset( $last_item->ID ) ) {
- $last_data = get_post( $last_item->ID );
- if ( ! is_wp_error( $last_data ) && isset( $last_data->menu_order ) ) {
- $args['menu-item-position'] = 1 + (int) $last_data->menu_order;
- }
-
- } else {
- $args['menu-item-position'] = $count;
- }
</del><ins>+ $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : $count;
</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,16 +343,16 @@
</span><span class="cx"> 'tax_input' => array( 'nav_menu' => array( intval( $menu->term_id ) ) ),
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // New menu item
</del><ins>+ // New menu item. Default is draft status
</ins><span class="cx"> if ( 0 == $menu_item_db_id ) {
</span><span class="cx"> $post['ID'] = 0;
</span><del>- $post['post_status'] = 'draft';
</del><ins>+ $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
</ins><span class="cx"> $menu_item_db_id = wp_insert_post( $post );
</span><span class="cx">
</span><del>- // Update existing menu item
</del><ins>+ // Update existing menu item. Default is publish status
</ins><span class="cx"> } else {
</span><span class="cx"> $post['ID'] = $menu_item_db_id;
</span><del>- $post['post_status'] = 'publish';
</del><ins>+ $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
</ins><span class="cx"> wp_update_post( $post );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -762,10 +755,11 @@
</span><span class="cx"> 'menu-item-object-id' => $post->ID,
</span><span class="cx"> 'menu-item-object' => $post->post_type,
</span><span class="cx"> 'menu-item-type' => 'post_type',
</span><ins>+ 'menu-item-status' => 'publish',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> foreach ( $auto_add as $menu_id ) {
</span><del>- $items = wp_get_nav_menu_items( $menu_id );
</del><ins>+ $items = wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
</ins><span class="cx"> if ( ! is_array( $items ) )
</span><span class="cx"> continue;
</span><span class="cx"> foreach ( $items as $item ) {
</span></span></pre>
</div>
</div>
</body>
</html>