Ticket #13958: 13958.patch

wp-admin/css/nav-menu.dev.css

@@ -295 +295 @@
         -moz-border-radius: 3px;
         -khtml-border-radius: 3px;
 }
+#menu-to-edit .menu-item-invalid .menu-item-handle {
+        background-image: -webkit-gradient(linear, center top, center bottom, from(#fdf8ff), to(#f6c9cc)) !important;
+        background-image: -moz-linear-gradient(top, #fdf8ff, #f6c9cc) !important;
+}
 .menu-item-edit-active .menu-item-handle {
         -moz-border-radius: 3px 3px 0 0;
         -webkit-border-bottom-right-radius: 0;

wp-admin/includes/nav-menu.php

@@ -65 +65 @@
                         'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
                 );
 
+                if ( isset( $item->_invalid ) )
+                        $classes[] = 'menu-item-invalid';
+
                 $title = $item->title;
 
                 if ( isset( $item->post_status ) && 'draft' == $item->post_status ) {

wp-includes/nav-menu.php

@@ -559 +559 @@
                         $menu_item->type = empty( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type;
 
                         if ( 'post_type' == $menu_item->type ) {
-                                $object = get_post_type_object( $menu_item->object );
-                                $menu_item->type_label = $object->labels->singular_name;
+                                if ( post_type_exists( $menu_item->object ) ) {
+                                        $menu_item->type_label = get_post_type_object( $menu_item->object )->labels->singular_name;
+                                } else {
+                                        $menu_item->type_label = $menu_item->object;
+                                        $menu_item->_invalid = true;
+                                }
+
                                 $menu_item->url = get_permalink( $menu_item->object_id );
 
                                 $original_object = get_post( $menu_item->object_id );
@@ -568 +573 @@
                                 $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
                         } elseif ( 'taxonomy' == $menu_item->type ) {
-                                $object = get_taxonomy( $menu_item->object );
-                                $menu_item->type_label = $object->labels->singular_name;
+                                if ( taxonomy_exists( $menu_item->object ) ) {
+                                        $menu_item->type_label = get_taxonomy( $menu_item->object )->labels->singular_name;
+                                } else {
+                                        $menu_item->type_label = $menu_item->object;
+                                        $menu_item->_invalid = true;
+                                }
+
                                 $term_url = get_term_link( (int) $menu_item->object_id, $menu_item->object );
                                 $menu_item->url = !is_wp_error( $term_url ) ? $term_url : '';