From 1d19b930fca761eb7fe615df20cf2e2263d0f030 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Sat, 26 Dec 2015 04:05:25 +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.

Built from https://develop.svn.wordpress.org/trunk@36095


git-svn-id: http://core.svn.wordpress.org/trunk@36060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-walker-nav-menu-edit.php | 4 +++-
 wp-includes/nav-menu.php                         | 4 +++-
 wp-includes/version.php                          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-walker-nav-menu-edit.php b/wp-admin/includes/class-walker-nav-menu-edit.php
index 33131c7f1f..b54f5127f0 100644
--- a/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/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/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 0ea3ada088..356b3b0160 100644
--- a/wp-includes/nav-menu.php
+++ b/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 )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 26c0adeb28..e50940da7b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36094';
+$wp_version = '4.5-alpha-36095';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.