<!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>[13293] trunk/wp-includes/custom-navigation.php:
improve custom menu hierarchy logic, See #11817</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13293">13293</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-22 17:27:34 +0000 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>improve custom menu hierarchy logic, 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 (13292 => 13293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-22 17:21:33 UTC (rev 13292)
+++ trunk/wp-includes/custom-navigation.php 2010-02-22 17:27:34 UTC (rev 13293)
</span><span class="lines">@@ -116,9 +116,10 @@
</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>+ $current_parent = 0;
</ins><span class="cx"> $parent_menu_order = array();
</span><span class="cx"> // Display Loop
</span><del>- foreach ( $menu_items as $menu_item ) {
</del><ins>+ foreach ( $menu_items as $key => $menu_item ) {
</ins><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><span class="cx"> $parent_menu_order[ $menu_item->ID ] = $menu_item->menu_order;
</span><span class="lines">@@ -199,31 +200,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> */
</span><del>- // Indent children
- if ( empty( $parent_stack ) ) {
- array_unshift( $parent_stack, $menu_item->ID );
- } elseif ( $menu_item->post_parent > 0 ) {
- if ( $menu_item->post_parent == $parent_stack[0] ) { ?>
- <ul>
-<?php array_unshift( $parent_stack, $menu_item->ID );
- } elseif ( count( $parent_stack ) > 1 && $menu_item->post_parent == $parent_stack[1] ) { ?>
- </li>
-<?php $parent_stack[0] = $menu_item->ID;
- } elseif ( in_array( $menu_item->post_parent, $parent_stack ) ) {
- while ( !empty( $parent_stack ) && $menu_item->post_parent != $parent_stack[0] ) { ?>
- </li></ul>
-<? array_shift( $parent_stack );
- }
- }
- } else {
- while ( count( $parent_stack ) > 1 ) { ?>
- </li></ul>
-<? array_shift( $parent_stack );
- } ?>
- </li>
-<?php $parent_stack[0] = $menu_item->ID;
- }
-
</del><span class="cx"> // List Items
</span><span class="cx"> ?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $li_class; ?>><?php
</span><span class="cx"> //@todo: update front end to use post data
</span><span class="lines">@@ -289,14 +265,25 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>- }
- while ( !empty( $parent_stack ) ) { ?>
- </li></ul>
-<? array_shift( $parent_stack );
- }
- if ( !empty( $menu_items ) ) { ?>
</del><ins>+ // Indent children
+ $last_item = ( count( $menu_items ) == $menu_item->menu_order );
+ if ( $last_item || $current_parent != $menu_items[ $key + 1 ]->post_parent ) {
+ if ( $last_item || in_array( $menu_items[ $key + 1 ]->post_parent, $parent_stack ) ) { ?>
</ins><span class="cx"> </li>
</span><del>-<?php }
</del><ins>+<?php while ( !empty( $parent_stack ) && ($last_item || $menu_items[ $key + 1 ]->post_parent != $current_parent ) ) { ?>
+ </ul>
+ </li>
+<? $current_parent = array_pop( $parent_stack );
+ } ?>
+<?php } else {
+ array_push( $parent_stack, $current_parent );
+ $current_parent = $menu_item->ID; ?>
+ <ul>
+<?php }
+ } else { ?>
+ </li>
+<?php }
+ }
</ins><span class="cx"> }
</span><span class="cx"> //@todo: implement menu heirarchy
</span><span class="cx"> //RECURSIVE Sub Menu Items
</span></span></pre>
</div>
</div>
</body>
</html>