<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13370] trunk: Fix menu links.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13370">13370</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-02-24 10:11:49 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix menu links. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (13369 => 13370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-02-24 09:43:09 UTC (rev 13369)
+++ trunk/wp-admin/nav-menus.php 2010-02-24 10:11:49 UTC (rev 13370)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> </ul>
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx"> <?php } ?>
</span><del>- <form onsubmit="updatepostdata()" action="nav-menus.php" method="post" enctype="multipart/form-data">
</del><ins>+ <form onsubmit="updatepostdata()" action="<?php echo admin_url( 'nav-menus.php' ); ?>" method="post" enctype="multipart/form-data">
</ins><span class="cx"> <div class="inside">
</span><span class="cx"> <?php if ( ! empty( $custom_menus ) ) : ?>
</span><span class="cx"> <?php echo $messagesdiv; ?>
</span><span class="lines">@@ -195,10 +195,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> //DISPLAY existing menu
</span><span class="cx"> if ( $menu_selected_id > 0 ) {
</span><del>- // SET output type
- $output_type = "backend";
- // MAIN OUTPUT FUNCTION
- wp_print_nav_menu( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
</del><ins>+ wp_print_nav_menu( 'type=backend&name='.$menu_title.'&id='.$menu_selected_id );
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (13369 => 13370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-02-24 09:43:09 UTC (rev 13369)
+++ trunk/wp-includes/nav-menu-template.php 2010-02-24 10:11:49 UTC (rev 13370)
</span><span class="lines">@@ -107,14 +107,14 @@
</span><span class="cx"> <a class="hide" href="<?php echo $menu_item->link; ?>"><?php echo $menu_item->title; ?></a>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <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; ?>" />
</span><del>- <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; ?>" />
</del><ins>+ <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 ) ); ?>" />
</ins><span class="cx"> <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; ?>" />
</span><span class="cx"> <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; ?>" />
</span><span class="cx"> <input type="hidden" name="linkurl<?php echo $menu_item->menu_order; ?>" id="linkurl<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->link; ?>" />
</span><span class="cx"> <input type="hidden" name="description<?php echo $menu_item->menu_order; ?>" id="description<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->description; ?>" />
</span><span class="cx"> <input type="hidden" name="icon<?php echo $menu_item->menu_order; ?>" id="icon<?php echo $menu_item->menu_order; ?>" value="0" />
</span><span class="cx"> <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; ?>" />
</span><del>- <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; ?>" />
</del><ins>+ <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 ) ); ?>" />
</ins><span class="cx"> <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 ); ?>" />
</span><span class="cx"> <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' ); ?>" />
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (13369 => 13370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-02-24 09:43:09 UTC (rev 13369)
+++ trunk/wp-includes/nav-menu.php 2010-02-24 10:11:49 UTC (rev 13370)
</span><span class="lines">@@ -94,10 +94,7 @@
</span><span class="cx"> switch ( $menu_item->type ) {
</span><span class="cx"> // Page Menu Item
</span><span class="cx"> case 'page':
</span><del>- if ( $menu_item->guid == '' )
- $menu_item->link = get_permalink( $menu_item->object_id );
- else
- $menu_item->link = $menu_item->guid;
</del><ins>+ $menu_item->link = get_page_link( $menu_item->object_id );
</ins><span class="cx">
</span><span class="cx"> if ( $menu_item->post_title == '' )
</span><span class="cx"> $menu_item->title = htmlentities( get_the_title( $menu_item->object_id ) );
</span><span class="lines">@@ -113,10 +110,7 @@
</span><span class="cx"> break;
</span><span class="cx"> // Category Menu Item
</span><span class="cx"> case 'category':
</span><del>- if ( empty($menu_item->guid) )
- $menu_item->link = get_category_link( $menu_item->object_id );
- else
- $menu_item->link = $menu_item->guid;
</del><ins>+ $menu_item->link = get_category_link( $menu_item->object_id );
</ins><span class="cx">
</span><span class="cx"> if ( empty($menu_item->post_title) ) {
</span><span class="cx"> $title_raw = get_category( $menu_item->object_id );
</span></span></pre>
</div>
</div>
</body>
</html>