diff --git wp-admin/includes/nav-menu.php wp-admin/includes/nav-menu.php
index 6e92928..bd1064a 100644
|
|
class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { |
54 | 54 | $original_title = ''; |
55 | 55 | if ( 'taxonomy' == $item->type ) { |
56 | 56 | $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' ); |
| 57 | if ( is_wp_error( $original_title ) ) |
| 58 | $original_title = $original_title->get_error_message(); |
57 | 59 | } elseif ( 'post_type' == $item->type ) { |
58 | 60 | $original_object = get_post( $item->object_id ); |
59 | 61 | $original_title = $original_object->post_title; |
… |
… |
function wp_get_nav_menu_to_edit( $menu_id = 0 ) { |
1073 | 1075 | return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name ) ); |
1074 | 1076 | |
1075 | 1077 | $some_pending_menu_items = false; |
| 1078 | $invalid_items = false; |
1076 | 1079 | foreach( (array) $menu_items as $menu_item ) { |
1077 | | if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) |
| 1080 | if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) { |
1078 | 1081 | $some_pending_menu_items = true; |
| 1082 | |
| 1083 | if ( ( $menu_item->type == 'post_type' && ! post_type_exists( $menu_item->object ) ) || ( ( $menu_item->type == 'taxonomy' ) && ! taxonomy_exists( $menu_item->object ) ) ) |
| 1084 | $invalid_items = true; |
| 1085 | } |
1079 | 1086 | } |
1080 | 1087 | |
1081 | 1088 | if ( $some_pending_menu_items ) |
1082 | | $result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>'; |
| 1089 | $result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . ( $invalid_items ? '<br />' . __( 'However, menu items associated with invalid post types or taxonomies will not be made public.' ) : '' ) . '</p></div>'; |
1083 | 1090 | |
1084 | 1091 | $result .= '<ul class="menu" id="menu-to-edit"> '; |
1085 | 1092 | $result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) ); |
diff --git wp-admin/nav-menus.php wp-admin/nav-menus.php
index 1e39805..11117cb 100644
|
|
switch ( $action ) { |
301 | 301 | |
302 | 302 | // update existing menu |
303 | 303 | } else { |
304 | | |
305 | 304 | $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id ); |
306 | 305 | |
307 | 306 | $menu_title = trim( esc_html( $_POST['menu-name'] ) ); |
diff --git wp-includes/nav-menu.php wp-includes/nav-menu.php
index e1af8f7..4930125 100644
|
|
function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item |
324 | 324 | $original_parent = get_term_field( 'parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' ); |
325 | 325 | $original_title = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' ); |
326 | 326 | } elseif ( 'post_type' == $args['menu-item-type'] ) { |
327 | | |
328 | 327 | $original_object = get_post( $args['menu-item-object-id'] ); |
329 | 328 | $original_parent = (int) $original_object->post_parent; |
330 | 329 | $original_title = $original_object->post_title; |
… |
… |
function wp_get_nav_menu_items( $menu, $args = array() ) { |
512 | 511 | } |
513 | 512 | |
514 | 513 | $items = array_map( 'wp_setup_nav_menu_item', $items ); |
| 514 | |
| 515 | if ( ! in_array( $args['post_status'], array( 'draft', 'any' ) ) ) |
| 516 | $items = array_filter( $items, create_function( '$item', 'return $item->post_status != "draft";' ) ); |
515 | 517 | |
516 | 518 | if ( ARRAY_A == $args['output'] ) { |
517 | 519 | $GLOBALS['_menu_item_sort_prop'] = $args['output_key']; |
… |
… |
function wp_setup_nav_menu_item( $menu_item ) { |
560 | 562 | |
561 | 563 | if ( 'post_type' == $menu_item->type ) { |
562 | 564 | $object = get_post_type_object( $menu_item->object ); |
563 | | $menu_item->type_label = $object->labels->singular_name; |
564 | | $menu_item->url = get_permalink( $menu_item->object_id ); |
565 | | |
| 565 | if ( empty( $object ) ) { |
| 566 | $menu_item->type_label = __( 'Invalid post type' ); |
| 567 | $menu_item->url = ''; |
| 568 | $menu_item->post_status = 'draft'; |
| 569 | } else { |
| 570 | $menu_item->type_label = $object->labels->singular_name; |
| 571 | $menu_item->url = get_permalink( $menu_item->object_id ); |
| 572 | } |
566 | 573 | $original_object = get_post( $menu_item->object_id ); |
567 | 574 | $original_title = $original_object->post_title; |
568 | 575 | $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title; |
569 | | |
570 | 576 | } elseif ( 'taxonomy' == $menu_item->type ) { |
571 | 577 | $object = get_taxonomy( $menu_item->object ); |
572 | | $menu_item->type_label = $object->labels->singular_name; |
| 578 | $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' ); |
| 579 | if ( empty( $object ) || is_wp_error( $original_title ) ) { |
| 580 | $menu_item->type_label = __( 'Invalid Taxonomy' ); |
| 581 | $menu_item->title = ''; |
| 582 | $menu_item->post_status = 'draft'; |
| 583 | } else { |
| 584 | $menu_item->type_label = $object->labels->singular_name; |
| 585 | $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title; |
| 586 | } |
| 587 | |
573 | 588 | $term_url = get_term_link( (int) $menu_item->object_id, $menu_item->object ); |
574 | 589 | $menu_item->url = !is_wp_error( $term_url ) ? $term_url : ''; |
575 | | |
576 | | $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' ); |
577 | | $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title; |
578 | | |
579 | 590 | } else { |
580 | 591 | $menu_item->type_label = __('Custom'); |
581 | 592 | $menu_item->title = $menu_item->post_title; |