Changeset 13370

Timestamp:

02/24/2010 10:11:49 AM (15 years ago)

Author:

markjaquith

Message:

Fix menu links. see #11817

Location:

trunk

Files:

• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-includes/nav-menu-template.php (modified) (2 diffs)
• wp-includes/nav-menu.php (modified) (2 diffs)

trunk/wp-admin/nav-menus.php

@@ -174 +174 @@
         <div class="clear"></div>
 <?php } ?>
-        <form onsubmit="updatepostdata()" action="nav-menus.php" method="post"  enctype="multipart/form-data">
+        <form onsubmit="updatepostdata()" action="<?php echo admin_url( 'nav-menus.php' ); ?>" method="post" enctype="multipart/form-data">
         <div class="inside">
         <?php if ( ! empty( $custom_menus ) ) : ?>
@@ -196 +196 @@
         //DISPLAY existing menu
         if ( $menu_selected_id > 0 ) {
-            // SET output type
-            $output_type = "backend";
-            // MAIN OUTPUT FUNCTION
-            wp_print_nav_menu( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
+            wp_print_nav_menu( 'type=backend&name='.$menu_title.'&id='.$menu_selected_id );
         }
         ?>

trunk/wp-includes/nav-menu-template.php

@@ -108 +108 @@
                         <?php } ?>
                         <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; ?>" />
-                        <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
+                        <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_attr( get_post_meta( $menu_item->ID, 'object_id', true ) ); ?>" />
                         <input type="hidden" name="parent<?php echo $menu_item->menu_order; ?>" id="parent<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->parent_item; ?>" />
                         <input type="hidden" name="title<?php echo $menu_item->menu_order; ?>" id="title<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->title; ?>" />
@@ -115 +115 @@
                         <input type="hidden" name="icon<?php echo $menu_item->menu_order; ?>" id="icon<?php echo $menu_item->menu_order; ?>" value="0" />
                         <input type="hidden" name="position<?php echo $menu_item->menu_order; ?>" id="position<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->menu_order; ?>" />
-                        <input type="hidden" name="linktype<?php echo $menu_item->menu_order; ?>" id="linktype<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->type; ?>" />
+                        <input type="hidden" name="linktype<?php echo $menu_item->menu_order; ?>" id="linktype<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_attr( get_post_meta( $menu_item->ID, 'menu_type', true ) ); ?>" />
                         <input type="hidden" name="anchortitle<?php echo $menu_item->menu_order; ?>" id="anchortitle<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_html( $menu_item->post_excerpt ); ?>" />
                         <input type="hidden" name="newwindow<?php echo $menu_item->menu_order; ?>" id="newwindow<?php echo $menu_item->menu_order; ?>" value="<?php echo ( '' == $menu_item->post_content_filtered ? '0' : '1' ); ?>" />

trunk/wp-includes/nav-menu.php

@@ -95 +95 @@
         // Page Menu Item
         case 'page':
-            if ( $menu_item->guid == '' )
-                $menu_item->link = get_permalink( $menu_item->object_id );
-            else
-                $menu_item->link = $menu_item->guid;
+            $menu_item->link = get_page_link( $menu_item->object_id );
 
             if ( $menu_item->post_title == '' )
@@ -114 +111 @@
         // Category Menu Item
         case 'category':
-            if ( empty($menu_item->guid) )
-                $menu_item->link = get_category_link( $menu_item->object_id );
-            else
-                $menu_item->link = $menu_item->guid;
+            $menu_item->link = get_category_link( $menu_item->object_id );
 
             if ( empty($menu_item->post_title) ) {