- 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.
- */
- function start_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat( "\t", $depth );
- $output .= "\n$indent
\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.
- */
- function end_lvl( &$output, $depth = 0, $args = array() ) {
- $indent = str_repeat( "\t", $depth );
- $output .= "\n$indent
";
- }
-
- /**
- * 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.
- */
- 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 . '
';
- $output .= '';
-
- // Menu item hidden fields
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- $output .= '';
- }
-
-} // 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.
@@ -356,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 ),
@@ -374,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,
@@ -402,7 +83,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
$var_by_ref = get_the_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(),
@@ -419,11 +100,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,
@@ -445,25 +126,27 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
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;
@@ -471,7 +154,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 ) {
@@ -503,21 +186,23 @@ function wp_nav_menu_post_type_meta_boxes() {
foreach ( $post_types as $post_type ) {
/**
- * Filter whether a menu items meta box will be added for the current post type.
+ * Filter whether a menu items meta box will be added for the current
+ * object type.
*
- * If a falsey value is returned instead of a post type object,
- * the post type menu items meta box will not be added.
+ * 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 $post_type The post type object to be used as a meta box.
+ * @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 );
}
}
}
@@ -534,16 +219,7 @@ function wp_nav_menu_taxonomy_meta_boxes() {
return;
foreach ( $taxonomies as $tax ) {
- /**
- * Filter whether a menu items meta box will be added for the current taxonomy.
- *
- * If a falsey value is returned instead of a taxonomy object,
- * the taxonomy menu items meta box will not be added.
- *
- * @since 3.0.0
- *
- * @param object $tax The taxonomy object to be used as a meta box.
- */
+ /** 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;
@@ -557,8 +233,7 @@ function wp_nav_menu_taxonomy_meta_boxes() {
*
* @since 3.6.0
*
- * @uses global $one_theme_location_no_menus to determine if no menus exist
- * @uses disabled() to output the disabled attribute in $other_attributes param in submit_button()
+ * @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
@@ -576,6 +251,9 @@ function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
* Displays a metabox 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;
@@ -615,6 +293,9 @@ function wp_nav_menu_item_link_meta_box() {
*
* @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.
*/
@@ -623,7 +304,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
$post_type_name = $post_type['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;
@@ -650,8 +331,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(
@@ -670,9 +349,6 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
'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' );
@@ -726,6 +402,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;
+
+ /**
+ * Filter 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 object $post_type The current post type object for this menu item meta box.
+ */
+ $most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type );
+
echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
?>
@@ -775,7 +466,10 @@ function wp_nav_menu_item_post_type_meta_box( $object, $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
* 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.
+ * The dynamic portion of the hook name, `$post_type_name`, refers
+ * to the slug of the current post type.
*
* @since 3.2.0
*
@@ -860,6 +571,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
*
* @since 3.0.0
*
+ * @global int|string $nav_menu_selected_id
+ *
* @param string $object Not used.
* @param string $taxonomy The taxonomy object.
*/
@@ -867,7 +580,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
global $nav_menu_selected_id;
$taxonomy_name = $taxonomy['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;
@@ -1058,21 +771,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
+ // 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)
- ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
+ // 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 ) ||
@@ -1125,20 +843,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',
@@ -1154,7 +872,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 ) {
@@ -1168,26 +886,32 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
$result .= '
' . __( 'Add menu items from the column on the left.' ) . '
';
/**
- * Filter the Walker class used to render a menu formatted for editing.
+ * Filter the Walker class used when adding nav menu items.
*
* @since 3.0.0
*
- * @param string $walker_class_name The Walker class used to render a menu formatted for editing.
- * @param int $menu_id The ID of the menu being rendered.
+ * @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 = $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 ) )
@@ -1221,6 +945,7 @@ function wp_nav_menu_manage_columns() {
return array(
'_title' => __('Show advanced menu properties'),
'cb' => '',
+ 'title-attribute' => __('Title Attribute'),
'link-target' => __('Link Target'),
'css-classes' => __('CSS Classes'),
'xfn' => __('Link Relationship (XFN)'),
@@ -1234,34 +959,31 @@ function wp_nav_menu_manage_columns() {
* @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
+ // 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 ) );
- 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
*
* @since 3.6.0
*
- * @uses wp_get_nav_menu_items() to retrieve the nav menu's menu items
- * @uses wp_defer_term_counter() to enable then disable term counting
- *
* @param int|string $nav_menu_selected_id (id, slug, or name ) of the currently-selected menu
* @param string $nav_menu_selected_title Title of the currently-selected menu
* @return array $messages The menu updated message
*/
function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
-
+ $messages = array();
$menu_items = array();
// Index menu items by db ID
foreach ( $unsorted_menu_items as $_item )
@@ -1277,7 +999,7 @@ function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_select
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 ] )
@@ -1289,10 +1011,11 @@ function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_select
$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[] = '