Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Avoid a PHP notice on Edit Menus screen when a menu is attached to a non-existing location.

Browse Source 
props nofearinc.
fixes #26287.
Built from https://develop.svn.wordpress.org/trunk@26634


git-svn-id: http://core.svn.wordpress.org/trunk@26524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2013-12-04 20:37:11 +00:00
parent 21c732c9b7
commit cac815c4e9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/nav-menus.php
View File

@ -630,7 +630,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
$locations_assigned_to_this_menu = array();
foreach ( array_keys( $menu_locations, $_nav_menu->term_id ) as $menu_location_key ) {
$locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
if ( isset( $locations[ $menu_location_key ] ) ) {
$locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
}
}
/**
@ -643,10 +645,12 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
$assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
// Adds ellipses following the number of locations defined in $assigned_locations
printf( ' (%1$s%2$s)',
implode( ', ', $assigned_locations ),
count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' …' : ''
);
if ( ! empty( $assigned_locations ) ) {
printf( ' (%1$s%2$s)',
implode( ', ', $assigned_locations ),
count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' …' : ''
);
}
}
?>
</option>