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

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

Props kucrut.
Fixes #34449 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-12-26 04:05:25 +00:00
parent d5d401ad10
commit 1d19b930fc
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/class-walker-nav-menu-edit.php
View File

@ -80,7 +80,9 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
$original_title = get_the_title( $original_object->ID );
} 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;
}
}
$classes = array(

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

@ -417,7 +417,9 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
$original_title = $original_object->post_title;
} 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;
}
}
if ( $args['menu-item-title'] == $original_title )

2
wp-includes/version.php
View File

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