Changeset 13286

Timestamp:

02/22/2010 12:26:21 AM (15 years ago)

Author:

wpmuguru

Message:

add custom menu hierarchy support to admin, See #11817

Location:

trunk

Files:

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

trunk/wp-admin/custom-navigation.php

@@ -135 +135 @@
             if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
             if (isset($_POST['postmenu'.$k])) { $object_id = $_POST['postmenu'.$k]; } else { $object_id = 0; }
-            //@todo implement heirarchy
             if (isset($_POST['parent'.$k])) { $parent_id = $_POST['parent'.$k]; } else { $parent_id = 0; }
             if (isset($_POST['title'.$k])) { $custom_title = $_POST['title'.$k]; } else { $custom_title = ''; }
@@ -155 +154 @@
             else
                 $post['post_content_filtered'] = '';
+            if ( $parent_id > 0 && isset( $_POST[ 'dbid' . $parent_id ] ) )
+                $post[ 'post_parent' ] = (int) $_POST[ 'dbid' . $parent_id ];
 
             // New menu item

trunk/wp-includes/custom-navigation.php

@@ -115 +115 @@
         elseif ( is_category() )
             $queried_id = $wp_query->get_queried_object_id();
+
+        $parent_stack = array();
         // Display Loop
         foreach ( $menu_items as $menu_item ) {
@@ -192 +194 @@
             }
 */
+            // 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 { ?>
+            </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
@@ -257 +280 @@
                         <?php
                     }
-
-                    //@todo: implement menu heirarchy
-/*                  //DISPLAY menu sub items
-                    if ($wp_custom_nav_menu_items->parent_id == 0)
-                    {
-                        //FRONTEND
-                        if ($type == 'frontend')
-                        {
-                            //Recursive function
-                            $intj = wp_custom_navigation_sub_items($wp_custom_nav_menu_items->id,$wp_custom_nav_menu_items->link_type,$table_name,$type,$wp_custom_nav_menu_id);
-                        }
-                        //BACKEND
-                        else
-                        {
-                            //Recursive function
-                            $intj = wp_custom_navigation_sub_items($wp_custom_nav_menu_items->id,$wp_custom_nav_menu_items->link_type,$table_name,$type,$id);
-                        }
-                    }
-*/          ?></li>
-            <?php
         }
+        while ( !empty( $parent_stack ) ) { ?>
+            </li></ul>
+<?          array_shift( $parent_stack );
+        } 
+        if ( !empty( $menu_items ) ) { ?>
+        </li>
+<?php       }
 }
 //@todo: implement menu heirarchy