WordPress.org
Get WordPress

Make WordPress Core

Ticket #34449: 34449.2.patch

File 34449.2.patch, 1.7 KB (added by sebastian.pisula, 10 years ago)

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

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
     
    7878                } elseif ( 'post_type' == $item->type ) {
    7979                        $original_object = get_post( $item->object_id );
    8080                        $original_title = get_the_title( $original_object->ID );
    81                 } elseif ( 'post_type_archive' == $item->type ) {
    82                         $original_object = get_post_type_object( $item->object );
     81                } elseif ( 'post_type_archive' == $item->type && ( $original_object = get_post_type_object( $item->object ) ) ) {
    8382                        $original_title = $original_object->labels->archives;
    8483                }
    8584

  • wp-includes/nav-menu.php 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
     
    403403                        $original_object = get_post( $args['menu-item-object-id'] );
    404404                        $original_parent = (int) $original_object->post_parent;
    405405                        $original_title = $original_object->post_title;
    406                 } elseif ( 'post_type_archive' == $args['menu-item-type'] ) {
    407                         $original_object = get_post_type_object( $args['menu-item-object'] );
     406                } elseif ( 'post_type_archive' == $args['menu-item-type'] && ( $original_object = get_post_type_object( $args['menu-item-object'] ) ) ) {
    408407                        $original_title = $original_object->labels->archives;
    409408                }
    410409