<!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>[13287] trunk/wp-includes/custom-navigation.php: output correct parent id,
visual hierarchy in admin, See #11817</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13287">13287</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-22 02:01:44 +0000 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>output correct parent id, visual hierarchy in admin, See <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/custom-navigation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13286 => 13287)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-22 00:26:21 UTC (rev 13286)
+++ trunk/wp-includes/custom-navigation.php 2010-02-22 02:01:44 UTC (rev 13287)
</span><span class="lines">@@ -116,11 +116,17 @@
</span><span class="cx"> $queried_id = $wp_query->get_queried_object_id();
</span><span class="cx">
</span><span class="cx"> $parent_stack = array();
</span><ins>+ $parent_menu_order = array();
</ins><span class="cx"> // Display Loop
</span><span class="cx"> foreach ( $menu_items as $menu_item ) {
</span><span class="cx"> $menu_type = get_post_meta($menu_item->ID, 'menu_type', true);
</span><span class="cx"> $object_id = get_post_meta($menu_item->ID, 'object_id', true);
</span><del>-
</del><ins>+ $parent_menu_order[ $menu_item->ID ] = $menu_item->menu_order;
+ if ( isset( $parent_menu_order[ $menu_item->post_parent ] ) )
+ $parent_item = $parent_menu_order[ $menu_item->post_parent ];
+ else
+ $parent_item = 0;
+
</ins><span class="cx"> switch ( $menu_type ) {
</span><span class="cx"> // Page Menu Item
</span><span class="cx"> case 'page':
</span><span class="lines">@@ -209,7 +215,11 @@
</span><span class="cx"> <? array_shift( $parent_stack );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else { ?>
</del><ins>+ } else {
+ while ( count( $parent_stack ) > 1 ) { ?>
+ </li></ul>
+<? array_shift( $parent_stack );
+ } ?>
</ins><span class="cx"> </li>
</span><span class="cx"> <?php $parent_stack[0] = $menu_item->ID;
</span><span class="cx"> }
</span><span class="lines">@@ -267,7 +277,7 @@
</span><span class="cx"> <a><span class=""></span></a>
</span><span class="cx"> <input type="hidden" name="dbid<?php echo $menu_item->menu_order; ?>" id="dbid<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
</span><span class="cx"> <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo $id; ?>" />
</span><del>- <input type="hidden" name="parent<?php echo $menu_item->menu_order; ?>" id="parent<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->post_parent; ?>" />
</del><ins>+ <input type="hidden" name="parent<?php echo $menu_item->menu_order; ?>" id="parent<?php echo $menu_item->menu_order; ?>" value="<?php echo $parent_item; ?>" />
</ins><span class="cx"> <input type="hidden" name="title<?php echo $menu_item->menu_order; ?>" id="title<?php echo $menu_item->menu_order; ?>" value="<?php echo $title; ?>" />
</span><span class="cx"> <input type="hidden" name="linkurl<?php echo $menu_item->menu_order; ?>" id="linkurl<?php echo $menu_item->menu_order; ?>" value="<?php echo $link; ?>" />
</span><span class="cx"> <input type="hidden" name="description<?php echo $menu_item->menu_order; ?>" id="description<?php echo $menu_item->menu_order; ?>" value="<?php echo $description; ?>" />
</span></span></pre>
</div>
</div>
</body>
</html>