X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/58f607a1de715c9bca69340a4d6fb9e1b9c2bed2..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-admin/includes/nav-menu.php diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index 8c8e9697..a6aac330 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -1,259 +1,17 @@ $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth; - - $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; - - ob_start(); - $item_id = esc_attr( $item->ID ); - $removed_args = array( - 'action', - 'customlink-tab', - 'edit-menu-item', - 'menu-item', - 'page-tab', - '_wpnonce', - ); - - $original_title = ''; - if ( 'taxonomy' == $item->type ) { - $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' ); - } elseif ( 'post_type' == $item->type ) { - $original_object = get_post( $item->object_id ); - $original_title = $original_object->post_title; - } - - $classes = array( - 'menu-item menu-item-depth-' . $depth, - 'menu-item-' . esc_attr( $item->object ), - 'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'), - ); - $title = $item->title; +/** Walker_Nav_Menu_Edit class */ +require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' ); - if ( isset( $item->post_status ) && 'draft' == $item->post_status ) { - $classes[] = 'pending'; - /* translators: %s: title of menu item in draft status */ - $title = sprintf( __('%s (Pending)'), $item->title ); - } - - $title = empty( $item->label ) ? $title : $item->label; - - ?> -
  • '; - $output .= ''; - - // Menu item hidden fields - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - $output .= ''; - } -} +/** Walker_Nav_Menu_Checklist class */ +require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' ); /** * Prints the appropriate response to a menu quick search. @@ -280,8 +38,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) { if ( 'markup' == $response_format ) { echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args ); } elseif ( 'json' == $response_format ) { - $post_obj = get_post( $object_id ); - echo json_encode( + echo wp_json_encode( array( 'ID' => $object_id, 'post_title' => get_the_title( $object_id ), @@ -298,7 +55,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) { echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args ); } elseif ( 'json' == $response_format ) { $post_obj = get_term( $object_id, $object_type ); - echo json_encode( + echo wp_json_encode( array( 'ID' => $object_id, 'post_title' => $post_obj->name, @@ -311,26 +68,38 @@ function _wp_ajax_menu_quick_search( $request = array() ) { } - } elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) { if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) { - query_posts(array( - 'posts_per_page' => 10, - 'post_type' => $matches[2], - 's' => $query, - )); - if ( ! have_posts() ) + $post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) ); + $args = array_merge( + $args, + array( + 'no_found_rows' => true, + 'update_post_meta_cache' => false, + 'update_post_term_cache' => false, + 'posts_per_page' => 10, + 'post_type' => $matches[2], + 's' => $query, + ) + ); + if ( isset( $post_type_obj->_default_query ) ) { + $args = array_merge( $args, (array) $post_type_obj->_default_query ); + } + $search_results_query = new WP_Query( $args ); + if ( ! $search_results_query->have_posts() ) { return; - while ( have_posts() ) { - the_post(); + } + while ( $search_results_query->have_posts() ) { + $post = $search_results_query->next_post(); if ( 'markup' == $response_format ) { - echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref = get_the_ID() ) ) ), 0, (object) $args ); + $var_by_ref = $post->ID; + echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args ); } elseif ( 'json' == $response_format ) { - echo json_encode( + echo wp_json_encode( array( - 'ID' => get_the_ID(), - 'post_title' => get_the_title(), - 'post_type' => get_post_type(), + 'ID' => $post->ID, + 'post_title' => get_the_title( $post->ID ), + 'post_type' => $matches[2], ) ); echo "\n"; @@ -343,11 +112,11 @@ function _wp_ajax_menu_quick_search( $request = array() ) { )); if ( empty( $terms ) || is_wp_error( $terms ) ) return; - foreach( (array) $terms as $term ) { + foreach ( (array) $terms as $term ) { if ( 'markup' == $response_format ) { echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args ); } elseif ( 'json' == $response_format ) { - echo json_encode( + echo wp_json_encode( array( 'ID' => $term->term_id, 'post_title' => $term->name, @@ -362,34 +131,34 @@ function _wp_ajax_menu_quick_search( $request = array() ) { } /** - * Register nav menu metaboxes and advanced menu items + * Register nav menu meta boxes and advanced menu items. * * @since 3.0.0 **/ function wp_nav_menu_setup() { // Register meta boxes - if ( 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(); + add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' ); wp_nav_menu_taxonomy_meta_boxes(); // Register advanced menu items (columns) - add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns'); + add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' ); // If first time editing, disable advanced items by default. - if( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { + if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { $user = wp_get_current_user(); update_user_option($user->ID, 'managenav-menuscolumnshidden', - array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', ), + array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ), true); } } /** - * Limit the amount of meta boxes to just links, pages and cats for first time users. + * Limit the amount of meta boxes to pages, posts, links, and categories for first time users. * * @since 3.0.0 + * + * @global array $wp_meta_boxes **/ function wp_initial_nav_menu_meta_boxes() { global $wp_meta_boxes; @@ -397,7 +166,7 @@ function wp_initial_nav_menu_meta_boxes() { if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) return; - $initial_meta_boxes = array( 'nav-menu-theme-locations', 'add-custom-links', 'add-page', 'add-category' ); + $initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' ); $hidden_meta_boxes = array(); foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) { @@ -417,7 +186,7 @@ function wp_initial_nav_menu_meta_boxes() { } /** - * Creates metaboxes for any post type menu item. + * Creates meta boxes for any post type menu item.. * * @since 3.0.0 */ @@ -428,16 +197,30 @@ function wp_nav_menu_post_type_meta_boxes() { return; foreach ( $post_types as $post_type ) { + /** + * Filters whether a menu items meta box will be added for the current + * object type. + * + * If a falsey value is returned instead of an object, the menu items + * meta box for the current meta box object will not be added. + * + * @since 3.0.0 + * + * @param object $meta_box_object The current object to add a menu items + * meta box for. + */ $post_type = apply_filters( 'nav_menu_meta_box_object', $post_type ); if ( $post_type ) { $id = $post_type->name; - add_meta_box( "add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', 'default', $post_type ); + // Give pages a higher priority. + $priority = ( 'page' == $post_type->name ? 'core' : 'default' ); + add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type ); } } } /** - * Creates metaboxes for any taxonomy menu item. + * Creates meta boxes for any taxonomy menu item. * * @since 3.0.0 */ @@ -448,6 +231,7 @@ function wp_nav_menu_taxonomy_meta_boxes() { return; foreach ( $taxonomies as $tax ) { + /** This filter is documented in wp-admin/includes/nav-menu.php */ $tax = apply_filters( 'nav_menu_meta_box_object', $tax ); if ( $tax ) { $id = $tax->name; @@ -457,98 +241,54 @@ function wp_nav_menu_taxonomy_meta_boxes() { } /** - * Displays a metabox for the nav menu theme locations. + * Check whether to disable the Menu Locations meta box submit button * - * @since 3.0.0 + * @since 3.6.0 + * + * @global bool $one_theme_location_no_menus to determine if no menus exist + * + * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu + * @return string Disabled attribute if at least one menu exists, false if not */ -function wp_nav_menu_locations_meta_box() { - global $nav_menu_selected_id; +function wp_nav_menu_disabled_check( $nav_menu_selected_id ) { + global $one_theme_location_no_menus; - if ( ! current_theme_supports( 'menus' ) ) { - // We must only support widgets. Leave a message and bail. - echo '

    ' . __('The current theme does not natively support menus, but you can use the “Custom Menu” widget to add any menus you create here to the theme’s sidebar.') . '

    '; - return; - } + if ( $one_theme_location_no_menus ) + return false; - $locations = get_registered_nav_menus(); - $menus = wp_get_nav_menus(); - $menu_locations = get_nav_menu_locations(); - $num_locations = count( array_keys($locations) ); - - echo '

    ' . sprintf( _n('Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n($num_locations) ) . '

    '; - - foreach ( $locations as $location => $description ) { - ?> -

    - -

    - -

    - - class="button-primary" name="nav-menu-locations" value="" /> -

    - $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1; - - $current_tab = 'create'; - if ( isset( $_REQUEST['customlink-tab'] ) && in_array( $_REQUEST['customlink-tab'], array('create', 'all') ) ) { - $current_tab = $_REQUEST['customlink-tab']; - } - $removed_args = array( - 'action', - 'customlink-tab', - 'edit-menu-item', - 'menu-item', - 'page-tab', - '_wpnonce', - ); + $_nav_menu_placeholder = 0 > $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1; ?>
    + + - - - - + -

    +

    - - class="button-secondary submit-add-to-menu" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> + class="button submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> +

    @@ -557,19 +297,29 @@ function wp_nav_menu_item_link_meta_box() { } /** - * Displays a metabox for a post type menu item. + * Displays a meta box for a post type menu item. * * @since 3.0.0 * + * @global int $_nav_menu_placeholder + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. - * @param string $post_type The post type object. + * @param array $box { + * Post type menu item meta box arguments. + * + * @type string $id Meta box 'id' attribute. + * @type string $title Meta box title. + * @type string $callback Meta box display callback. + * @type WP_Post_Type $args Extra meta box arguments (the post type object for this meta box). + * } */ -function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { +function wp_nav_menu_item_post_type_meta_box( $object, $box ) { global $_nav_menu_placeholder, $nav_menu_selected_id; - $post_type_name = $post_type['args']->name; + $post_type_name = $box['args']->name; - // paginate browsing for large numbers of post objects + // Paginate browsing for large numbers of post objects. $per_page = 50; $pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1; $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0; @@ -585,8 +335,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { 'update_post_meta_cache' => false ); - if ( isset( $post_type['args']->_default_query ) ) - $args = array_merge($args, (array) $post_type['args']->_default_query ); + if ( isset( $box['args']->_default_query ) ) + $args = array_merge($args, (array) $box['args']->_default_query ); // @todo transient caching of these results with proper invalidation on updating of a post of this type $get_posts = new WP_Query; @@ -596,8 +346,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { return; } - $post_type_object = get_post_type_object($post_type_name); - $num_pages = $get_posts->max_num_pages; $page_links = paginate_links( array( @@ -610,16 +358,19 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { ) ), 'format' => '', - 'prev_text' => __('«'), - 'next_text' => __('»'), - 'total' => $num_pages, + 'prev_text' => '' . __( '«' ) . '', + 'next_text' => '' . __( '»' ) . '', + 'before_page_number' => '' . __( 'Page' ) . ' ', + 'total' => $num_pages, 'current' => $pagenum )); - if ( !$posts ) - $error = '
  • '. $post_type['args']->labels->not_found .'
    • '; + $db_fields = false; + if ( is_post_type_hierarchical( $post_type_name ) ) { + $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' ); + } - $walker = new Walker_Nav_Menu_Checklist; + $walker = new Walker_Nav_Menu_Checklist( $db_fields ); $current_tab = 'most-recent'; if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) { @@ -642,19 +393,46 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { ?>
    +
  • > + + + +
    • +
  • > + + + +
    • +
  • > + + + +
    • +
    @@ -673,12 +451,13 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { } ?>

    - - - + + + + 'submit-quick-search-posttype-' . $post_type_name ) ); ?>

    -
    -
    @@ -701,26 +479,29 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
    -
    - -

    +

    + ?>#posttype-" class="select-all aria-button-if-js"> - - class="button-secondary submit-add-to-menu" value="" name="add-post-type-menu-item" id="submit-posttype-" /> + class="button submit-add-to-menu right" value="" name="add-post-type-menu-item" id="" /> +

    @@ -771,18 +586,27 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { } /** - * Displays a metabox for a taxonomy menu item. + * Displays a meta box for a taxonomy menu item. * * @since 3.0.0 * + * @global int|string $nav_menu_selected_id + * * @param string $object Not used. - * @param string $taxonomy The taxonomy object. + * @param array $box { + * Taxonomy menu item meta box arguments. + * + * @type string $id Meta box 'id' attribute. + * @type string $title Meta box title. + * @type string $callback Meta box display callback. + * @type object $args Extra meta box arguments (the taxonomy object for this meta box). + * } */ -function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { +function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) { global $nav_menu_selected_id; - $taxonomy_name = $taxonomy['args']->name; + $taxonomy_name = $box['args']->name; - // paginate browsing for large numbers of objects + // Paginate browsing for large numbers of objects. $per_page = 50; $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1; $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0; @@ -793,7 +617,6 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { 'hide_empty' => false, 'hierarchical' => 1, 'include' => '', - 'include_last_update_time' => false, 'number' => $per_page, 'offset' => $offset, 'order' => 'ASC', @@ -820,13 +643,19 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { ) ), 'format' => '', - 'prev_text' => __('«'), - 'next_text' => __('»'), - 'total' => $num_pages, + 'prev_text' => '' . __( '«' ) . '', + 'next_text' => '' . __( '»' ) . '', + 'before_page_number' => '' . __( 'Page' ) . ' ', + 'total' => $num_pages, 'current' => $pagenum )); - $walker = new Walker_Nav_Menu_Checklist; + $db_fields = false; + if ( is_taxonomy_hierarchical( $taxonomy_name ) ) { + $db_fields = array( 'parent' => 'parent', 'id' => 'term_id' ); + } + + $walker = new Walker_Nav_Menu_Checklist( $db_fields ); $current_tab = 'most-used'; if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) { @@ -849,10 +678,22 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) { ?>
    +
  • > + + + +
    • +
  • > + + + +
    • +
  • > + + + +
    • +
    checklist" class="list: categorychecklist form-no-clear"> +
    -

    +

    + ?>#taxonomy-" class="select-all aria-button-if-js"> - - class="button-secondary submit-add-to-menu" value="" name="add-taxonomy-menu-item" id="submit-taxonomy-" /> + class="button submit-add-to-menu right" value="" name="add-taxonomy-menu-item" id="" /> +

    @@ -957,21 +799,26 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) { if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) { - // Loop through all the menu items' POST values - foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) { + // Loop through all the menu items' POST values. + foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) { if ( - empty( $_item_object_data['menu-item-object-id'] ) && // checkbox is not checked + // Checkbox is not checked. + empty( $_item_object_data['menu-item-object-id'] ) && ( - ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set - in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default - ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page) - ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists + // And item type either isn't set. + ! isset( $_item_object_data['menu-item-type'] ) || + // Or URL is the default. + in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || + ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page) + // Or it *is* a custom menu item that already exists. + ! empty( $_item_object_data['menu-item-db-id'] ) ) ) { - continue; // then this potential menu item is not getting added to this menu + // Then this potential menu item is not getting added to this menu. + continue; } - // if this possible menu item doesn't actually have a menu database ID yet + // If this possible menu item doesn't actually have a menu database ID yet. if ( empty( $_item_object_data['menu-item-db-id'] ) || ( 0 > $_possible_db_id ) || @@ -1024,20 +871,20 @@ function _wp_nav_menu_meta_box_object( $object = null ) { 'post_status' => 'publish', ); - // posts should show only published items + // Posts should show only published items. } elseif ( 'post' == $object->name ) { $object->_default_query = array( 'post_status' => 'publish', ); - // cats should be in reverse chronological order + // Categories should be in reverse chronological order. } elseif ( 'category' == $object->name ) { $object->_default_query = array( 'orderby' => 'id', 'order' => 'DESC', ); - // custom post types should show only published items + // Custom post types should show only published items. } else { $object->_default_query = array( 'post_status' => 'publish', @@ -1053,7 +900,7 @@ function _wp_nav_menu_meta_box_object( $object = null ) { * * @since 3.0.0 * - * @param string $menu_id The ID of the menu to format. + * @param int $menu_id Optional. The ID of the menu to format. Default 0. * @return string|WP_Error $output The menu formatted to edit or error object on failure. */ function wp_get_nav_menu_to_edit( $menu_id = 0 ) { @@ -1064,27 +911,48 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) { $menu_items = wp_get_nav_menu_items( $menu->term_id, array('post_status' => 'any') ); $result = '
    ' : '">'; - $result .= '

    ' . __('Select menu items (pages, categories, links) from the boxes at left to begin building your custom menu.') . '

    '; + $result .= '

    ' . __( 'Add menu items from the column on the left.' ) . '

    '; $result .= '
    '; - if( empty($menu_items) ) + if ( empty($menu_items) ) return $result . ' '; + /** + * Filters the Walker class used when adding nav menu items. + * + * @since 3.0.0 + * + * @param string $class The walker class to use. Default 'Walker_Nav_Menu_Edit'. + * @param int $menu_id ID of the menu being rendered. + */ $walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id ); - if ( class_exists( $walker_class_name ) ) + if ( class_exists( $walker_class_name ) ) { $walker = new $walker_class_name; - else - return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named %s does not exist.'), $walker_class_name ) ); + } else { + return new WP_Error( 'menu_walker_not_exist', + /* translators: %s: walker class name */ + sprintf( __( 'The Walker class named %s does not exist.' ), + '' . $walker_class_name . '' + ) + ); + } - $some_pending_menu_items = false; - foreach( (array) $menu_items as $menu_item ) { + $some_pending_menu_items = $some_invalid_menu_items = false; + foreach ( (array) $menu_items as $menu_item ) { if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) $some_pending_menu_items = true; + if ( ! empty( $menu_item->_invalid ) ) + $some_invalid_menu_items = true; + } + + if ( $some_pending_menu_items ) { + $result .= '

    ' . __( 'Click Save Menu to make pending menu items public.' ) . '

    '; } - if ( $some_pending_menu_items ) - $result .= '

    ' . __('Click Save Menu to make pending menu items public.') . '

    '; + if ( $some_invalid_menu_items ) { + $result .= '

    ' . __( 'There are some invalid menu items. Please check or delete them.' ) . '

    '; + } $result .= '