From 0df95091ee9b0758efdb25e3c487c46862fb65fe Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sat, 26 Dec 2015 04:04:55 +0000 Subject: [PATCH] Nav Menus: Avoid a PHP Notice when a menu contains a now unregistered post type archive. Props kucrut. Fixes #34449 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@36095 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-walker-nav-menu-edit.php | 4 +++- src/wp-includes/nav-menu.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php index 33131c7f1f..b54f5127f0 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php @@ -80,7 +80,9 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu { $original_title = get_the_title( $original_object->ID ); } elseif ( 'post_type_archive' == $item->type ) { $original_object = get_post_type_object( $item->object ); - $original_title = $original_object->labels->archives; + if ( $original_object ) { + $original_title = $original_object->labels->archives; + } } $classes = array( diff --git a/src/wp-includes/nav-menu.php b/src/wp-includes/nav-menu.php index 0ea3ada088..356b3b0160 100644 --- a/src/wp-includes/nav-menu.php +++ b/src/wp-includes/nav-menu.php @@ -417,7 +417,9 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item $original_title = $original_object->post_title; } elseif ( 'post_type_archive' == $args['menu-item-type'] ) { $original_object = get_post_type_object( $args['menu-item-object'] ); - $original_title = $original_object->labels->archives; + if ( $original_object ) { + $original_title = $original_object->labels->archives; + } } if ( $args['menu-item-title'] == $original_title )