WordPress.org
Get WordPress

Make WordPress Core

Ticket #34449: 34449.3.diff

File 34449.3.diff, 1.4 KB (added by kucrut, 10 years ago)

Refresh patch

  • src/wp-admin/includes/class-walker-nav-menu-edit.php 

    diff --git src/wp-admin/includes/class-walker-nav-menu-edit.php src/wp-admin/includes/class-walker-nav-menu-edit.php
index 105e613..c5ab6d1 100644
    class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { 
    8080                        $original_title = get_the_title( $original_object->ID );
    8181                } elseif ( 'post_type_archive' == $item->type ) {
    8282                        $original_object = get_post_type_object( $item->object );
    83                         $original_title = $original_object->labels->archives;
     83                        if ( is_object( $original_object ) ) {
     84                                $original_title = $original_object->labels->archives;
     85                        }
    8486                }
    8587
    8688                $classes = array(

  • src/wp-includes/nav-menu.php 

    diff --git src/wp-includes/nav-menu.php src/wp-includes/nav-menu.php
index 91a102a..a8cfce4 100644
    function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item 
    417417                        $original_title = $original_object->post_title;
    418418                } elseif ( 'post_type_archive' == $args['menu-item-type'] ) {
    419419                        $original_object = get_post_type_object( $args['menu-item-object'] );
    420                         $original_title = $original_object->labels->archives;
     420                        if ( is_object( $original_object ) ) {
     421                                $original_title = $original_object->labels->archives;
     422                        }
    421423                }
    422424
    423425                if ( $args['menu-item-title'] == $original_title )