' . __('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 .= '' . __('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 ) { - ?> -- -
- -
-  ); ?>)
-
-
+
+
-
-
-
-
+
'. $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' );
@@ -661,10 +377,22 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
?>
-
- class="button-secondary submit-add-to-menu" value="" name="add-custom-menu-item" id="submit-customlinkdiv" />
+ class="button-secondary submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" />
+
+ >
+
+
+
+
+ >
+
+
+
+
+ >
+
+
+
+
+
-
@@ -692,12 +435,12 @@ 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 ) ); ?>
-
+
@@ -720,22 +462,24 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
- -
+
-
_add_to_top = true;
- $front_page_obj->label = sprintf( _x('Home: %s', 'nav menu front page title'), $front_page_obj->post_title );
+ $front_page_obj->front_or_home = true;
array_unshift( $posts, $front_page_obj );
} else {
$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
array_unshift( $posts, (object) array(
- '_add_to_top' => true,
+ 'front_or_home' => true,
'ID' => 0,
'object_id' => $_nav_menu_placeholder,
'post_content' => '',
@@ -749,7 +493,39 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
}
}
- $posts = apply_filters( 'nav_menu_items_'.$post_type_name, $posts, $args, $post_type );
+ $post_type = get_post_type_object( $post_type_name );
+ $archive_link = get_post_type_archive_link( $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
+ * 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
+ *
+ * @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.
+ */
+ $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'] ) ) {
@@ -767,23 +543,22 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
-
- class="button-secondary submit-add-to-menu" value="" name="add-post-type-menu-item" id="submit-posttype-" />
+ class="button-secondary submit-add-to-menu right" value="" name="add-post-type-menu-item" id="" />
+
+ >
+
+
+
+
+ >
+
+
+
+
+ >
+
+
+
+
+
checklist" class="list: categorychecklist form-no-clear">
+
-
-
- 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+
+
+ 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
-
+
-
-
- class="button-secondary submit-add-to-menu" value="" name="add-taxonomy-menu-item" id="submit-taxonomy-" />
+ class="button-secondary submit-add-to-menu right" value="" name="add-taxonomy-menu-item" id="" />
+
@@ -983,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
- ! ( '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 ) ||
@@ -1050,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',
@@ -1079,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 ) {
@@ -1090,21 +883,35 @@ 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 = '';
- if( empty($menu_items) )
+ if ( empty($menu_items) )
return $result . ' ';
+ /**
+ * Filter 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 = $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 ) )
@@ -1125,7 +932,6 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
return $menu;
}
-
}
/**
@@ -1139,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)'),
@@ -1152,18 +959,103 @@ 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() - (60*60*24*EMPTY_TRASH_DAYS);
+ $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
+ *
+ * @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 )
+ $menu_items[$_item->db_id] = $_item;
+
+ $post_fields = array(
+ 'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
+ 'menu-item-parent-id', 'menu-item-position', 'menu-item-type',
+ 'menu-item-title', 'menu-item-url', 'menu-item-description',
+ 'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn'
+ );
+
+ 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 ) {
+
+ // Menu item title can't be blank
+ if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+ continue;
-?>
+ $args = array();
+ foreach ( $post_fields as $field )
+ $args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+
+ $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 ) ) {
+ $messages[] = '' . $menu_item_db_id->get_error_message() . '
' . + /* translators: %s: nav menu title */ + sprintf( __( '%s has been updated.' ), + '' . $nav_menu_selected_title . '' + ) . '