IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix menu links. see #11817

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith
2010-02-24 10:11:49 +00:00
parent 654c7a3888
commit 67aed4d0a2
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/nav-menu.php
View File

@@ -94,10 +94,7 @@ function wp_setup_nav_menu_item($menu_item, $type = 'item', $position = 0) {
switch ( $menu_item->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 );