@@ -195,10 +195,7 @@ if ( $postCounter > 0 && $menu_selected_id > 0 && ! $updated ) {
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 );
}
?>
diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 5d144e695..1d6550042 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -107,14 +107,14 @@ function wp_print_nav_menu_item($menu_item, $context, $args = array() ) {
title; ?>
-
+
-
+
type ) {
// 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 == '' )
$menu_item->title = htmlentities( get_the_title( $menu_item->object_id ) );
@@ -113,10 +110,7 @@ function wp_setup_nav_menu_item($menu_item, $type = 'item', $position = 0) {
break;
// 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) ) {
$title_raw = get_category( $menu_item->object_id );