--- a/wp/wp-admin/includes/nav-menu.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/nav-menu.php Mon Oct 14 17:39:30 2019 +0200
@@ -1,335 +1,17 @@
<?php
-
/**
- * Create HTML list of nav menu input items.
+ * Core Navigation Menu API
*
* @package WordPress
+ * @subpackage Nav_Menus
* @since 3.0.0
- * @uses Walker_Nav_Menu
*/
-class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
- /**
- * Starts the list before the elements are added.
- *
- * @see Walker_Nav_Menu::start_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- */
- public function start_lvl( &$output, $depth = 0, $args = array() ) {}
-
- /**
- * Ends the list of after the elements are added.
- *
- * @see Walker_Nav_Menu::end_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- */
- public function end_lvl( &$output, $depth = 0, $args = array() ) {}
-
- /**
- * Start the element output.
- *
- * @see Walker_Nav_Menu::start_el()
- * @since 3.0.0
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param object $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- * @param int $id Not used.
- */
- public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
- global $_wp_nav_menu_max_depth;
- $_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_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 = get_the_title( $original_object->ID );
- }
-
- $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;"';
-
- ?>
- <li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
- <dl class="menu-item-bar">
- <dt class="menu-item-handle">
- <span class="item-title"><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></span>
- <span class="item-controls">
- <span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
- <span class="item-order hide-if-js">
- <a href="<?php
- echo wp_nonce_url(
- add_query_arg(
- array(
- 'action' => 'move-up-menu-item',
- 'menu-item' => $item_id,
- ),
- remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
- ),
- 'move-menu_item'
- );
- ?>" class="item-move-up"><abbr title="<?php esc_attr_e('Move up'); ?>">↑</abbr></a>
- |
- <a href="<?php
- echo wp_nonce_url(
- add_query_arg(
- array(
- 'action' => 'move-down-menu-item',
- 'menu-item' => $item_id,
- ),
- remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
- ),
- 'move-menu_item'
- );
- ?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">↓</abbr></a>
- </span>
- <a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" href="<?php
- echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
- ?>"><?php _e( 'Edit Menu Item' ); ?></a>
- </span>
- </dt>
- </dl>
- <div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>">
- <?php if( 'custom' == $item->type ) : ?>
- <p class="field-url description description-wide">
- <label for="edit-menu-item-url-<?php echo $item_id; ?>">
- <?php _e( 'URL' ); ?><br />
- <input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
- </label>
- </p>
- <?php endif; ?>
- <p class="description description-thin">
- <label for="edit-menu-item-title-<?php echo $item_id; ?>">
- <?php _e( 'Navigation Label' ); ?><br />
- <input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
- </label>
- </p>
- <p class="description description-thin">
- <label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
- <?php _e( 'Title Attribute' ); ?><br />
- <input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
- </label>
- </p>
- <p class="field-link-target description">
- <label for="edit-menu-item-target-<?php echo $item_id; ?>">
- <input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
- <?php _e( 'Open link in a new window/tab' ); ?>
- </label>
- </p>
- <p class="field-css-classes description description-thin">
- <label for="edit-menu-item-classes-<?php echo $item_id; ?>">
- <?php _e( 'CSS Classes (optional)' ); ?><br />
- <input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
- </label>
- </p>
- <p class="field-xfn description description-thin">
- <label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
- <?php _e( 'Link Relationship (XFN)' ); ?><br />
- <input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
- </label>
- </p>
- <p class="field-description description description-wide">
- <label for="edit-menu-item-description-<?php echo $item_id; ?>">
- <?php _e( 'Description' ); ?><br />
- <textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
- <span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
- </label>
- </p>
-
- <p class="field-move hide-if-no-js description description-wide">
- <label>
- <span><?php _e( 'Move' ); ?></span>
- <a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e( 'Up one' ); ?></a>
- <a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e( 'Down one' ); ?></a>
- <a href="#" class="menus-move menus-move-left" data-dir="left"></a>
- <a href="#" class="menus-move menus-move-right" data-dir="right"></a>
- <a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e( 'To the top' ); ?></a>
- </label>
- </p>
-
- <div class="menu-item-actions description-wide submitbox">
- <?php if( 'custom' != $item->type && $original_title !== false ) : ?>
- <p class="link-to-original">
- <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
- </p>
- <?php endif; ?>
- <a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
- echo wp_nonce_url(
- add_query_arg(
- array(
- 'action' => 'delete-menu-item',
- 'menu-item' => $item_id,
- ),
- admin_url( 'nav-menus.php' )
- ),
- 'delete-menu_item_' . $item_id
- ); ?>"><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array( 'edit-menu-item' => $item_id, 'cancel' => time() ), admin_url( 'nav-menus.php' ) ) );
- ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
- </div>
-
- <input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
- <input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
- <input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
- <input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
- <input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
- <input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
- </div><!-- .menu-item-settings-->
- <ul class="menu-item-transport"></ul>
- <?php
- $output .= ob_get_clean();
- }
-
-} // Walker_Nav_Menu_Edit
+/** Walker_Nav_Menu_Edit class */
+require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
-/**
- * Create HTML list of nav menu input items.
- *
- * @since 3.0.0
- * @uses Walker_Nav_Menu
- */
-class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
- public function __construct( $fields = false ) {
- if ( $fields ) {
- $this->db_fields = $fields;
- }
- }
-
- /**
- * Starts the list before the elements are added.
- *
- * @see Walker_Nav_Menu::start_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param int $depth Depth of page. Used for padding.
- * @param array $args Not used.
- */
- public function start_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat( "\t", $depth );
- $output .= "\n$indent<ul class='children'>\n";
- }
-
- /**
- * Ends the list of after the elements are added.
- *
- * @see Walker_Nav_Menu::end_lvl()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param int $depth Depth of page. Used for padding.
- * @param array $args Not used.
- */
- public function end_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat( "\t", $depth );
- $output .= "\n$indent</ul>";
- }
-
- /**
- * Start the element output.
- *
- * @see Walker_Nav_Menu::start_el()
- *
- * @since 3.0.0
- *
- * @param string $output Passed by reference. Used to append additional content.
- * @param object $item Menu item data object.
- * @param int $depth Depth of menu item. Used for padding.
- * @param array $args Not used.
- * @param int $id Not used.
- */
- public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
- global $_nav_menu_placeholder;
-
- $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
- $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
- $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
-
- $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
-
- $output .= $indent . '<li>';
- $output .= '<label class="menu-item-title">';
- $output .= '<input type="checkbox" class="menu-item-checkbox';
-
- if ( ! empty( $item->front_or_home ) )
- $output .= ' add-to-top';
-
- $output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
-
- if ( ! empty( $item->label ) ) {
- $title = $item->label;
- } elseif ( isset( $item->post_type ) ) {
- /** This filter is documented in wp-includes/post-template.php */
- $title = apply_filters( 'the_title', $item->post_title, $item->ID );
- if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
- $title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
- }
-
- $output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
- $output .= '</label>';
-
- // Menu item hidden fields
- $output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
- $output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
- $output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
- $output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
- $output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
- $output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
- $output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="'. esc_attr( $item->target ) .'" />';
- $output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="'. esc_attr( $item->attr_title ) .'" />';
- $output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="'. esc_attr( implode( ' ', $item->classes ) ) .'" />';
- $output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="'. esc_attr( $item->xfn ) .'" />';
- }
-
-} // Walker_Nav_Menu_Checklist
+/** 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.
@@ -388,24 +70,36 @@
} 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 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";
@@ -418,7 +112,7 @@
));
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 ) {
@@ -437,7 +131,7 @@
}
/**
- * Register nav menu metaboxes and advanced menu items
+ * Register nav menu meta boxes and advanced menu items.
*
* @since 3.0.0
**/
@@ -451,18 +145,20 @@
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;
@@ -470,7 +166,7 @@
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 ) {
@@ -490,7 +186,7 @@
}
/**
- * Creates metaboxes for any post type menu item.
+ * Creates meta boxes for any post type menu item..
*
* @since 3.0.0
*/
@@ -502,7 +198,7 @@
foreach ( $post_types as $post_type ) {
/**
- * Filter whether a menu items meta box will be added for the current
+ * 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
@@ -518,13 +214,13 @@
$id = $post_type->name;
// 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
*/
@@ -549,11 +245,11 @@
*
* @since 3.6.0
*
- * @uses global $one_theme_location_no_menus to determine if no menus exist
+ * @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_disabled_check( $nav_menu_selected_id ) {
global $one_theme_location_no_menus;
@@ -564,9 +260,12 @@
}
/**
- * Displays a metabox for the custom links menu item.
+ * Displays a meta box for the custom links menu item.
*
* @since 3.0.0
+ *
+ * @global int $_nav_menu_placeholder
+ * @global int|string $nav_menu_selected_id
*/
function wp_nav_menu_item_link_meta_box() {
global $_nav_menu_placeholder, $nav_menu_selected_id;
@@ -576,23 +275,19 @@
?>
<div class="customlinkdiv" id="customlinkdiv">
<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
- <p id="menu-item-url-wrap">
- <label class="howto" for="custom-menu-item-url">
- <span><?php _e('URL'); ?></span>
- <input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
- </label>
+ <p id="menu-item-url-wrap" class="wp-clearfix">
+ <label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+ <input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
</p>
- <p id="menu-item-name-wrap">
- <label class="howto" for="custom-menu-item-name">
- <span><?php _e( 'Link Text' ); ?></span>
- <input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Menu Item'); ?>" />
- </label>
+ <p id="menu-item-name-wrap" class="wp-clearfix">
+ <label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+ <input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" />
</p>
- <p class="button-controls">
+ <p class="button-controls wp-clearfix">
<span class="add-to-menu">
- <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+ <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
<span class="spinner"></span>
</span>
</p>
@@ -602,17 +297,27 @@
}
/**
- * 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.
$per_page = 50;
@@ -630,8 +335,8 @@
'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;
@@ -653,9 +358,10 @@
)
),
'format' => '',
- 'prev_text' => __('«'),
- 'next_text' => __('»'),
- 'total' => $num_pages,
+ 'prev_text' => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '«' ) . '</span>',
+ 'next_text' => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '»' ) . '</span>',
+ 'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+ 'total' => $num_pages,
'current' => $pagenum
));
@@ -712,7 +418,24 @@
$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;
- echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
+
+ /**
+ * 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
+ * @since 4.9.0 Added the `$recent_args` parameter.
+ *
+ * @param array $most_recent An array of post objects being listed.
+ * @param array $args An array of WP_Query arguments for the meta box.
+ * @param array $box Arguments passed to wp_nav_menu_item_post_type_meta_box().
+ * @param array $recent_args An array of WP_Query arguments for 'Most Recent' tab.
+ */
+ $most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box, $recent_args );
+
+ echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $most_recent ), 0, (object) $args );
?>
</ul>
</div><!-- /.tabs-panel -->
@@ -730,9 +453,10 @@
}
?>
<p class="quick-search-wrap">
- <input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
+ <label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+ <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
<span class="spinner"></span>
- <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+ <?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
</p>
<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
@@ -788,22 +512,41 @@
}
}
+ $post_type = get_post_type_object( $post_type_name );
+
+ if ( $post_type->has_archive ) {
+ $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
+ array_unshift( $posts, (object) array(
+ 'ID' => 0,
+ 'object_id' => $_nav_menu_placeholder,
+ 'object' => $post_type_name,
+ 'post_content' => '',
+ 'post_excerpt' => '',
+ 'post_title' => $post_type->labels->archives,
+ 'post_type' => 'nav_menu_item',
+ 'type' => 'post_type_archive',
+ 'url' => get_post_type_archive_link( $post_type_name ),
+ ) );
+ }
+
/**
- * Filter the posts displayed in the 'View All' tab of the current
+ * Filters the posts displayed in the 'View All' tab of the current
* post type's menu items meta box.
*
* The dynamic portion of the hook name, `$post_type_name`, refers
* to the slug of the current post type.
*
* @since 3.2.0
+ * @since 4.6.0 Converted the `$post_type` parameter to accept a WP_Post_Type object.
*
* @see WP_Query::query()
*
- * @param array $posts The posts for the current post type.
- * @param array $args An array of WP_Query arguments.
- * @param object $post_type The current post type object for this menu item meta box.
+ * @param array $posts The posts for the current post type.
+ * @param array $args An array of WP_Query arguments.
+ * @param WP_Post_Type $post_type The current post type object for this menu item meta box.
*/
$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
+
$checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
@@ -821,7 +564,7 @@
<?php endif; ?>
</div><!-- /.tabs-panel -->
- <p class="button-controls">
+ <p class="button-controls wp-clearfix">
<span class="list-controls">
<a href="<?php
echo esc_url( add_query_arg(
@@ -831,11 +574,11 @@
),
remove_query_arg( $removed_args )
));
- ?>#posttype-<?php echo $post_type_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
+ ?>#posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
</span>
<span class="add-to-menu">
- <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+ <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
<span class="spinner"></span>
</span>
</p>
@@ -845,16 +588,26 @@
}
/**
- * 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;
+ $taxonomy = get_taxonomy( $taxonomy_name );
// Paginate browsing for large numbers of objects.
$per_page = 50;
@@ -893,9 +646,10 @@
)
),
'format' => '',
- 'prev_text' => __('«'),
- 'next_text' => __('»'),
- 'total' => $num_pages,
+ 'prev_text' => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '«' ) . '</span>',
+ 'next_text' => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '»' ) . '</span>',
+ 'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+ 'total' => $num_pages,
'current' => $pagenum
));
@@ -929,7 +683,7 @@
<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
- <?php _e( 'Most Used' ); ?>
+ <?php echo esc_html( $taxonomy->labels->most_used ); ?>
</a>
</li>
<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
@@ -990,9 +744,10 @@
}
?>
<p class="quick-search-wrap">
- <input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
+ <label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+ <input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
<span class="spinner"></span>
- <?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+ <?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
</p>
<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
@@ -1009,7 +764,7 @@
</ul>
</div><!-- /.tabs-panel -->
- <p class="button-controls">
+ <p class="button-controls wp-clearfix">
<span class="list-controls">
<a href="<?php
echo esc_url(add_query_arg(
@@ -1019,11 +774,11 @@
),
remove_query_arg($removed_args)
));
- ?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
+ ?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
</span>
<span class="add-to-menu">
- <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+ <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
<span class="spinner"></span>
</span>
</p>
@@ -1048,7 +803,7 @@
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 ) {
+ foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
if (
// Checkbox is not checked.
empty( $_item_object_data['menu-item-object-id'] ) &&
@@ -1162,11 +917,11 @@
$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
$result .= '</div>';
- if( empty($menu_items) )
+ if ( empty($menu_items) )
return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
/**
- * Filter the Walker class used when adding nav menu items.
+ * Filters the Walker class used when adding nav menu items.
*
* @since 3.0.0
*
@@ -1175,24 +930,32 @@
*/
$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 <strong>%s</strong> 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.' ),
+ '<strong>' . $walker_class_name . '</strong>'
+ )
+ );
+ }
$some_pending_menu_items = $some_invalid_menu_items = false;
- foreach( (array) $menu_items as $menu_item ) {
+ 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 .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+ if ( $some_pending_menu_items ) {
+ $result .= '<div class="notice notice-info notice-alt inline"><p>' . __( 'Click Save Menu to make pending menu items public.' ) . '</p></div>';
+ }
- if ( $some_invalid_menu_items )
- $result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+ if ( $some_invalid_menu_items ) {
+ $result .= '<div class="notice notice-error notice-alt inline"><p>' . __( 'There are some invalid menu items. Please check or delete them.' ) . '</p></div>';
+ }
$result .= '<ul class="menu" id="menu-to-edit"> ';
$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
@@ -1209,16 +972,17 @@
*
* @since 3.0.0
*
- * @return string|WP_Error $output The menu formatted to edit or error object on failure.
+ * @return array Columns.
*/
function wp_nav_menu_manage_columns() {
return array(
- '_title' => __('Show advanced menu properties'),
- 'cb' => '<input type="checkbox" />',
- 'link-target' => __('Link Target'),
- 'css-classes' => __('CSS Classes'),
- 'xfn' => __('Link Relationship (XFN)'),
- 'description' => __('Description'),
+ '_title' => __( 'Show advanced menu properties' ),
+ 'cb' => '<input type="checkbox" />',
+ 'link-target' => __( 'Link Target' ),
+ 'title-attribute' => __( 'Title Attribute' ),
+ 'css-classes' => __( 'CSS Classes' ),
+ 'xfn' => __( 'Link Relationship (XFN)' ),
+ 'description' => __( 'Description' ),
);
}
@@ -1228,18 +992,18 @@
* @access private
* @since 3.0.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
*/
function _wp_delete_orphaned_draft_menu_items() {
global $wpdb;
$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
// Delete orphaned draft menu items.
- $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
+ $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < %d", $delete_timestamp ) );
- foreach( (array) $menu_items_to_delete as $menu_item_id )
+ foreach ( (array) $menu_items_to_delete as $menu_item_id )
wp_delete_post( $menu_item_id, true );
}
-add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
/**
* Saves nav menu items
@@ -1268,7 +1032,7 @@
wp_defer_term_counting( true );
// Loop through all the menu items' POST variables
if ( ! empty( $_POST['menu-item-db-id'] ) ) {
- foreach( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
+ foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
// Menu item title can't be blank
if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
@@ -1280,10 +1044,11 @@
$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
- if ( is_wp_error( $menu_item_db_id ) )
+ if ( is_wp_error( $menu_item_db_id ) ) {
$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
- elseif ( isset( $menu_items[$menu_item_db_id] ) )
- unset( $menu_items[$menu_item_db_id] );
+ } else {
+ unset( $menu_items[ $menu_item_db_id ] );
+ }
}
}
@@ -1317,8 +1082,56 @@
/** This action is documented in wp-includes/nav-menu.php */
do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
- $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( '<strong>%1$s</strong> has been updated.' ), $nav_menu_selected_title ) . '</p></div>';
+ $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
+ /* translators: %s: nav menu title */
+ sprintf( __( '%s has been updated.' ),
+ '<strong>' . $nav_menu_selected_title . '</strong>'
+ ) . '</p></div>';
+
unset( $menu_items, $unsorted_menu_items );
return $messages;
}
+
+/**
+ * If a JSON blob of navigation menu data is in POST data, expand it and inject
+ * it into `$_POST` to avoid PHP `max_input_vars` limitations. See #14134.
+ *
+ * @ignore
+ * @since 4.5.3
+ * @access private
+ */
+function _wp_expand_nav_menu_post_data() {
+ if ( ! isset( $_POST['nav-menu-data'] ) ) {
+ return;
+ }
+
+ $data = json_decode( stripslashes( $_POST['nav-menu-data'] ) );
+
+ if ( ! is_null( $data ) && $data ) {
+ foreach ( $data as $post_input_data ) {
+ // For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
+ // derive the array path keys via regex and set the value in $_POST.
+ preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
+
+ $array_bits = array( $matches[1] );
+
+ if ( isset( $matches[3] ) ) {
+ $array_bits = array_merge( $array_bits, explode( '][', $matches[3] ) );
+ }
+
+ $new_post_data = array();
+
+ // Build the new array value from leaf to trunk.
+ for ( $i = count( $array_bits ) - 1; $i >= 0; $i -- ) {
+ if ( $i == count( $array_bits ) - 1 ) {
+ $new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
+ } else {
+ $new_post_data = array( $array_bits[ $i ] => $new_post_data );
+ }
+ }
+
+ $_POST = array_replace_recursive( $_POST, $new_post_data );
+ }
+ }
+}