Changeset 14263 for trunk/wp-admin/nav-menus.php

Timestamp:

04/28/2010 02:04:30 AM (16 years ago)

Author:

nacin

Message:

Verify nav menu items. props filosofo, fixes #13154.

File:

• trunk/wp-admin/nav-menus.php (modified) (4 diffs)

trunk/wp-admin/nav-menus.php

@@ -64 +64 @@
                 $menu_item_id = (int) $_REQUEST['menu-item'];
                 $next_item_id = 0;
-                if ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) {
+                if ( is_nav_menu_item( $menu_item_id ) ) {
                         $menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
                         if ( ! is_wp_error( $menus ) ) {
@@ -85 +85 @@
                 check_admin_referer( 'move-menu_item' );
                 $menu_item_id = empty( $next_item_id ) ? (int) $_REQUEST['menu-item'] : $next_item_id;
-                if ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) {
+                if ( is_nav_menu_item( $menu_item_id ) ) {
                         $menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
                         if ( ! is_wp_error( $menus ) ) {
@@ -167 +167 @@
 
 
-                if ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) {
+                if ( is_nav_menu_item( $menu_item_id ) ) {
                         if ( wp_delete_post( $menu_item_id, true ) ) {
                                 
@@ -261 +261 @@
 
                                 // Remove menu items from the menu that weren't in $_POST
-                                if ( !empty( $menu_items ) ) {
+                                if ( ! empty( $menu_items ) ) {
                                         foreach ( array_keys( $menu_items ) as $menu_item_id ) {
-                                                wp_delete_post( $menu_item_id );
+                                                if ( is_nav_menu_item( $menu_item_id ) ) {
+                                                        wp_delete_post( $menu_item_id );
+                                                }
                                         }
                                 }