Changeset 36888

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.

Location:

trunk

Files:

• src/wp-includes/nav-menu.php (modified) (1 diff)
• tests/phpunit/tests/post/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 ) {

trunk/tests/phpunit/tests/post/nav-menu.php

@@ -259 +259 @@
         $this->assertEquals( $menu_item_description , $post_type_archive_item->description );
     }
+
+    /**
+     * @ticket 35324
+     */
+    function test_wp_setup_nav_menu_item_for_unknown_post_type_archive_no_description() {
+
+        $post_type_slug = rand_str( 12 );
+
+        $post_type_archive_item_id = wp_update_nav_menu_item( $this->menu_id, 0, array(
+            'menu-item-type'   => 'post_type_archive',
+            'menu-item-object' => $post_type_slug,
+            'menu-item-status' => 'publish'
+        ) );
+        $post_type_archive_item = wp_setup_nav_menu_item( get_post( $post_type_archive_item_id ) );
+
+        $this->assertEmpty( $post_type_archive_item->description );
+    }
 }