X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be15bd505d66a91e2c80062190b13e315a04a9..e3ff8f35458a959c1879c0a4976701ed8dcfe651:/wp-admin/includes/nav-menu.php diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index 7e9fe6ad..a6aac330 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -1,289 +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' ); - if ( is_wp_error( $original_title ) ) - $original_title = false; - } 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; - - if ( ! empty( $item->_invalid ) ) { - $classes[] = 'menu-item-invalid'; - /* translators: %s: title of menu item which is invalid */ - $title = sprintf( __( '%s (Invalid)' ), $item->title ); - } elseif ( 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 = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label; - - $submenu_text = ''; - if ( 0 == $depth ) - $submenu_text = 'style="display: none;"'; - - ?> -
  • '; - $output .= ''; - - // Menu item hidden fields - $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. @@ -310,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 ), @@ -328,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, @@ -343,24 +70,36 @@ 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 ) { - $var_by_ref = get_the_ID(); + $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"; @@ -373,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, @@ -392,32 +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 wp_nav_menu_post_type_meta_boxes(); - add_meta_box( 'add-custom-links', __( 'Links' ), 'wp_nav_menu_item_link_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_taxonomy_meta_boxes(); // Register advanced menu items (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; @@ -425,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-page', 'add-custom-links', '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 ) { @@ -445,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 */ @@ -456,18 +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; - // give pages a higher priority + // Give pages a higher priority. $priority = ( 'page' == $post_type->name ? 'core' : 'default' ); - add_meta_box( "add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type ); + 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 */ @@ -478,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; @@ -486,62 +240,16 @@ function wp_nav_menu_taxonomy_meta_boxes() { } } -/** - * Displays a metabox for the nav menu theme locations. - * - * @since 3.0.0 - */ -function wp_nav_menu_locations_meta_box() { - global $nav_menu_selected_id; - - 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; - } - - $locations = get_registered_nav_menus(); - $menus = wp_get_nav_menus(); - $menu_locations = get_nav_menu_locations(); - $num_locations = count( array_keys($locations) ); - - echo '

    ' . _n( 'Select a menu to use within your theme.', 'Select the menus you will use in your theme.', $num_locations ) . '

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

    - -

    - -

    - - -

    -
    - - -

    +

    - class="button-secondary submit-add-to-menu right" 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" />

    @@ -590,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; @@ -618,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; @@ -629,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( @@ -643,15 +358,13 @@ 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' ); @@ -705,6 +418,21 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { $recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) ); $most_recent = $get_posts->query( $recent_args ); $args['walker'] = $walker; + + /** + * Filters the posts displayed in the 'Most Recent' tab of the current + * post type's menu items meta box. + * + * The dynamic portion of the hook name, `$post_type_name`, refers to the post type name. + * + * @since 4.3.0 + * + * @param array $most_recent An array of post objects being listed. + * @param array $args An array of WP_Query arguments. + * @param array $box Arguments passed to wp_nav_menu_item_post_type_meta_box(). + */ + $most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box ); + echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args ); ?> @@ -723,9 +451,10 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) { } ?>

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