WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-03-08 18:25:26 +00:00
parent 7e8e3429e1
commit f64b97c597
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/nav-menu.php
View File

@ -762,13 +762,15 @@ function wp_setup_nav_menu_item( $menu_item ) {
$object = get_post_type_object( $menu_item->object ); $object = get_post_type_object( $menu_item->object );
if ( $object ) { if ( $object ) {
$menu_item->title = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title; $menu_item->title = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title;
$post_type_description = $object->description;
} else { } else {
$menu_item->_invalid = true; $menu_item->_invalid = true;
$post_type_description = '';
} }
$menu_item->type_label = __( 'Post Type Archive' ); $menu_item->type_label = __( 'Post Type Archive' );
$post_content = wp_trim_words( $menu_item->post_content, 200 ); $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 ); $menu_item->url = get_post_type_archive_link( $menu_item->object );
} elseif ( 'taxonomy' == $menu_item->type ) { } elseif ( 'taxonomy' == $menu_item->type ) {
$object = get_taxonomy( $menu_item->object ); $object = get_taxonomy( $menu_item->object );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta2-36887'; $wp_version = '4.5-beta2-36888';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.