Changeset 36095

Timestamp:

12/26/2015 04:04:55 AM (9 years ago)

Author:

dd32

Message:

Nav Menus: Avoid a PHP Notice when a menu contains a now unregistered post type archive.

Props kucrut.
Fixes #34449 for trunk.

Location:

trunk/src

Files:

• wp-admin/includes/class-walker-nav-menu-edit.php (modified) (1 diff)
• wp-includes/nav-menu.php (modified) (1 diff)

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

@@ -81 +81 @@
         } 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;
+            }
         }
 

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

@@ -418 +418 @@
         } 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;
+            }
         }