IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't show an error when the theme supports widgets but not menus. see #13825.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15191 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin
2010-06-10 17:37:15 +00:00
parent af612805e8
commit 2010aac02c
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/nav-menu.php
View File

@@ -365,7 +365,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
**/
function wp_nav_menu_setup() {
// Register meta boxes
if ( get_registered_nav_menus() && wp_get_nav_menus() )
if ( ( current_theme_supports( 'widgets' ) || get_registered_nav_menus() ) && wp_get_nav_menus() )
add_meta_box( 'nav-menu-theme-locations', __( 'Theme Locations' ), 'wp_nav_menu_locations_meta_box' , 'nav-menus', 'side', 'default' );
add_meta_box( 'add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
wp_nav_menu_post_type_meta_boxes();
@@ -461,6 +461,13 @@ function wp_nav_menu_taxonomy_meta_boxes() {
function wp_nav_menu_locations_meta_box() {
global $nav_menu_selected_id;
$locations = get_registered_nav_menus();
if ( empty( $locations ) ) {
// We must only support widgets. Leave a message and bail.
echo '<p class="howto">' . __('The current theme does not natively support menus, but you can use the &#8220;Custom Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p>';
return;
}
$menus = wp_get_nav_menus();
$menu_locations = get_nav_menu_locations();
$num_locations = count( array_keys($locations) );