Changeset 13293

Timestamp:

02/22/2010 05:27:34 PM (15 years ago)

Author:

wpmuguru

Message:

improve custom menu hierarchy logic, See #11817

File:

• trunk/wp-includes/custom-navigation.php (modified) (3 diffs)

trunk/wp-includes/custom-navigation.php

@@ -117 +117 @@
 
         $parent_stack = array();
+        $current_parent = 0;
         $parent_menu_order = array();
         // Display Loop
-        foreach ( $menu_items as $menu_item ) {
+        foreach ( $menu_items as $key => $menu_item ) {
             $menu_type = get_post_meta($menu_item->ID, 'menu_type', true);
             $object_id = get_post_meta($menu_item->ID, 'object_id', true);
@@ -200 +201 @@
             }
 */
-            // 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;
-            }
-
             // List Items
             ?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $li_class; ?>><?php
@@ -290 +266 @@
                         <?php
                     }
-        }
-        while ( !empty( $parent_stack ) ) { ?>
-            </li></ul>
-<?          array_shift( $parent_stack );
-        } 
-        if ( !empty( $menu_items ) ) { ?>
+            // 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 ) ) { ?>
         </li>
-<?php       }
+<?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           }
+    }       
 }
 //@todo: implement menu heirarchy