<!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>[14263] trunk: Verify nav menu items.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14263">14263</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-28 02:04:30 +0000 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Verify nav menu items. props filosofo, fixes <a href="http://trac.wordpress.org/ticket/13154">#13154</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.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="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (14262 => 14263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-04-27 22:36:46 UTC (rev 14262)
+++ trunk/wp-admin/admin-ajax.php 2010-04-28 02:04:30 UTC (rev 14263)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> if ( ! current_user_can( 'switch_themes' ) )
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><del>- if ( 'nav_menu_item' == get_post_type( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
</del><ins>+ if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
</ins><span class="cx"> die('1');
</span><span class="cx"> else
</span><span class="cx"> die('0');
</span><span class="lines">@@ -1466,33 +1466,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> die( '0' );
</span><del>-case 'save-custom-link':
- if ( ! current_user_can('manage_links') )
- die('-1');
-
- $link_name = isset( $_POST['link_name'] ) ? esc_html($_POST['link_name']) : null;
- $link_url = isset( $_POST['link_url'] ) ? esc_url_raw($_POST['link_url']) : null;
-
- if ( !$link_name || !$link_url )
- die('-1');
-
- $post = array(
- 'post_status' => 'draft', 'post_type' => 'nav_menu_item', 'ping_status' => 0,
- 'post_author' => $user_ID, 'post_title' => $link_name, 'post_excerpt' => '',
- 'post_parent' => 0, 'menu_order' => 0, 'post_content' => '',
- );
-
- $link_id = wp_insert_post( $post );
-
- update_post_meta( $link_id, '_menu_item_type', 'custom' );
- update_post_meta( $link_id, '_menu_item_object_id', (int) $link_id );
- update_post_meta( $link_id, '_menu_item_object', 'custom' );
- update_post_meta( $link_id, '_menu_item_target', '' );
- update_post_meta( $link_id, '_menu_item_classes', '' );
- update_post_meta( $link_id, '_menu_item_xfn', '' );
- update_post_meta( $link_id, '_menu_item_url', $link_url );
-
- die( json_encode($link_id) );
</del><ins>+ break;
</ins><span class="cx"> default :
</span><span class="cx"> do_action( 'wp_ajax_' . $_POST['action'] );
</span><span class="cx"> die('0');
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14262 => 14263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-04-27 22:36:46 UTC (rev 14262)
+++ trunk/wp-admin/nav-menus.php 2010-04-28 02:04:30 UTC (rev 14263)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> check_admin_referer( 'move-menu_item' );
</span><span class="cx"> $menu_item_id = (int) $_REQUEST['menu-item'];
</span><span class="cx"> $next_item_id = 0;
</span><del>- if ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) {
</del><ins>+ if ( is_nav_menu_item( $menu_item_id ) ) {
</ins><span class="cx"> $menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
</span><span class="cx"> if ( ! is_wp_error( $menus ) ) {
</span><span class="cx"> foreach( (array) $menus as $menu_id ) {
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> case 'move-up-menu-item' :
</span><span class="cx"> check_admin_referer( 'move-menu_item' );
</span><span class="cx"> $menu_item_id = empty( $next_item_id ) ? (int) $_REQUEST['menu-item'] : $next_item_id;
</span><del>- if ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) {
</del><ins>+ if ( is_nav_menu_item( $menu_item_id ) ) {
</ins><span class="cx"> $menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
</span><span class="cx"> if ( ! is_wp_error( $menus ) ) {
</span><span class="cx"> foreach( (array) $menus as $menu_id ) {
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> check_admin_referer( 'delete-menu_item_' . $menu_item_id );
</span><span class="cx">
</span><span class="cx">
</span><del>- if ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) {
</del><ins>+ if ( is_nav_menu_item( $menu_item_id ) ) {
</ins><span class="cx"> if ( wp_delete_post( $menu_item_id, true ) ) {
</span><span class="cx">
</span><span class="cx"> $messages_div = '<div id="message" class="updated"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
</span><span class="lines">@@ -260,9 +260,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Remove menu items from the menu that weren't in $_POST
</span><del>- if ( !empty( $menu_items ) ) {
</del><ins>+ if ( ! empty( $menu_items ) ) {
</ins><span class="cx"> foreach ( array_keys( $menu_items ) as $menu_item_id ) {
</span><del>- wp_delete_post( $menu_item_id );
</del><ins>+ if ( is_nav_menu_item( $menu_item_id ) ) {
+ wp_delete_post( $menu_item_id );
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (14262 => 14263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-04-27 22:36:46 UTC (rev 14262)
+++ trunk/wp-includes/nav-menu.php 2010-04-28 02:04:30 UTC (rev 14263)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Check if navigation menu exists.
</del><ins>+ * Check if the given ID is a nav menu.
</ins><span class="cx"> *
</span><del>- * Returns the menu object, or false if the term doesn't exist.
</del><ins>+ * Returns true if it is; false otherwise.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="lines">@@ -57,6 +57,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Determine whether the given ID is a nav menu item.
+ *
+ * @since 3.0.0
+ *
+ * @param int $menu_item_id The ID of the potential nav menu item.
+ * @return bool Whether the given ID is that of a nav menu item.
+ */
+function is_nav_menu_item( $menu_item_id = 0 ) {
+ return ( ! is_wp_error( $menu_item_id ) && ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) );
+}
+
+/**
</ins><span class="cx"> * Create a Navigation Menu.
</span><span class="cx"> *
</span><span class="cx"> * Optional args:
</span><span class="lines">@@ -178,6 +190,11 @@
</span><span class="cx"> $menu_id = (int) $menu_id;
</span><span class="cx"> $menu_item_db_id = (int) $menu_item_db_id;
</span><span class="cx">
</span><ins>+ // make sure that we don't convert non-nav_menu_item objects into nav_menu_item objects
+ if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) ) {
+ return new WP_Error('update_nav_menu_item_failed', __('The given object ID is not that of a menu item.'));
+ }
+
</ins><span class="cx"> $menu = wp_get_nav_menu_object( $menu_id );
</span><span class="cx">
</span><span class="cx"> if ( ! $menu || is_wp_error( $menu ) ) {
</span><span class="lines">@@ -235,6 +252,7 @@
</span><span class="cx">
</span><span class="cx"> // New menu item
</span><span class="cx"> if ( 0 == $menu_item_db_id ) {
</span><ins>+ $post['ID'] = 0;
</ins><span class="cx"> $menu_item_db_id = wp_insert_post( $post );
</span><span class="cx">
</span><span class="cx"> // Update existing menu item
</span></span></pre>
</div>
</div>
</body>
</html>