Changeset 36888 for trunk/src/wp-includes/nav-menu.php

Timestamp:

03/08/2016 06:24:50 PM (9 years ago)

Author:

DrewAPicture

Message:

Menus: Avoid a notice when outputting a description for an existing archive menu item for a post type that doesn't.

Props bradyvercher.
See [36859]. Fixes #35324.

File:

• trunk/src/wp-includes/nav-menu.php (modified) (1 diff)

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

@@ -763 +763 @@
                 if ( $object ) {
                     $menu_item->title = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title;
+                    $post_type_description = $object->description;
                 } else {
                     $menu_item->_invalid = true;
+                    $post_type_description = '';
                 }
 
                 $menu_item->type_label = __( 'Post Type Archive' );
                 $post_content = wp_trim_words( $menu_item->post_content, 200 );
-                $post_type_description = '' == $post_content ? $object->description : $post_content; 
+                $post_type_description = '' == $post_content ? $post_type_description : $post_content; 
                 $menu_item->url = get_post_type_archive_link( $menu_item->object );
             } elseif ( 'taxonomy' == $menu_item->type ) {