mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-12 12:50:28 +00:00
Various bug fixes and improvements to menu management. props ptahdunbar, see #11817.
git-svn-id: https://develop.svn.wordpress.org/trunk@13802 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
+97
-1
@@ -934,7 +934,7 @@ class Walker {
|
||||
else
|
||||
$children_elements[ $e->$parent_field ][] = $e;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* when none of the elements is top level
|
||||
* assume the first one must be root of the sub elements
|
||||
@@ -1123,6 +1123,102 @@ class Walker {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create HTML list of nav menu items.
|
||||
*
|
||||
* @package WordPress
|
||||
* @since 3.0.0
|
||||
* @uses Walker
|
||||
*/
|
||||
class Walker_Nav_Menu extends Walker {
|
||||
/**
|
||||
* @see Walker::$tree_type
|
||||
* @since 3.0.0
|
||||
* @var string
|
||||
*/
|
||||
var $tree_type = array( 'post_type', 'taxonomy', 'custom' );
|
||||
|
||||
/**
|
||||
* @see Walker::$db_fields
|
||||
* @since 3.0.0
|
||||
* @todo Decouple this.
|
||||
* @var array
|
||||
*/
|
||||
var $db_fields = array( 'parent' => 'post_parent', 'id' => 'object_id' );
|
||||
|
||||
/**
|
||||
* @see Walker::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.
|
||||
*/
|
||||
function start_lvl(&$output, $depth) {
|
||||
$indent = str_repeat("\t", $depth);
|
||||
$output .= "\n$indent<ul class=\"sub-menu\">\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* @see Walker::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.
|
||||
*/
|
||||
function end_lvl(&$output, $depth) {
|
||||
$indent = str_repeat("\t", $depth);
|
||||
$output .= "$indent</ul>\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* @see Walker::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 int $current_page Menu item ID.
|
||||
* @param array $args
|
||||
*/
|
||||
function start_el(&$output, $item, $depth, $args) {
|
||||
$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
|
||||
|
||||
if ( 'frontend' == $args->context ) {
|
||||
global $wp_query;
|
||||
|
||||
$css_class = array( 'menu-item', 'menu-item-type-'. $item->type, $item->classes );
|
||||
|
||||
if ( 'custom' != $item->object )
|
||||
$css_class[] = 'menu-item-object-'. $item->object;
|
||||
|
||||
if ( $item->object_id == $wp_query->get_queried_object_id() )
|
||||
$css_class[] = 'current-menu-item';
|
||||
|
||||
// @todo add classes for parent/child relationships
|
||||
|
||||
$css_class = join( ' ', apply_filters('nav_menu_css_class', $css_class, $item) );
|
||||
}
|
||||
|
||||
$maybe_value = ( 'backend' == $args->context ) ? ' value="'. $item->ID .'"' : '';
|
||||
$maybe_classes = ( 'frontend' == $args->context ) ? ' class="'. $css_class .'"' : '';
|
||||
|
||||
$output .= $indent . '<li id="menu-item-'. $item->ID .'"'. $maybe_value . $maybe_classes .'>' . wp_get_nav_menu_item( $item, $args->context, $args );
|
||||
}
|
||||
|
||||
/**
|
||||
* @see Walker::end_el()
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param string $output Passed by reference. Used to append additional content.
|
||||
* @param object $item Page data object. Not used.
|
||||
* @param int $depth Depth of page. Not Used.
|
||||
*/
|
||||
function end_el(&$output, $item, $depth) {
|
||||
$output .= "</li>\n";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Create HTML list of pages.
|
||||
*
|
||||
|
||||
@@ -9,13 +9,11 @@
|
||||
* menu_class - CSS class to use for the div container of the menu list. Defaults to 'menu'.
|
||||
* format - Whether to format the ul. Defaults to 'div'.
|
||||
* fallback_cb - If the menu doesn't exists, a callback function will fire. Defaults to 'wp_page_menu'.
|
||||
* before_link - Output text before the link.
|
||||
* after_link - Output text after the link.
|
||||
* before_title - Output text before the link text.
|
||||
* before_title - Output text after the link text.
|
||||
* before - Text before the link text.
|
||||
* after - Text after the link text.
|
||||
* link_before - Text before the link.
|
||||
* link_after - Text after the link.
|
||||
* echo - Whether to echo the menu or return it. Defaults to echo.
|
||||
*
|
||||
* TODO:
|
||||
* show_home - If you set this argument, then it will display the link to the home page. The show_home argument really just needs to be set to the value of the text of the link.
|
||||
*
|
||||
* @since 3.0.0
|
||||
@@ -24,7 +22,8 @@
|
||||
*/
|
||||
function wp_nav_menu( $args = array() ) {
|
||||
$defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true,
|
||||
'fallback_cb' => 'wp_page_menu', 'before_link' => '', 'after_link' => '', 'before_title' => '', 'after_title' => '', );
|
||||
'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '',
|
||||
'depth' => 0, 'walker' => '' );
|
||||
|
||||
$args = wp_parse_args( $args, $defaults );
|
||||
$args = apply_filters( 'wp_nav_menu_args', $args );
|
||||
@@ -83,8 +82,8 @@ function wp_nav_menu( $args = array() ) {
|
||||
* @return mixed $output False if menu doesn't exists, else, returns the menu.
|
||||
**/
|
||||
function wp_get_nav_menu( $args = array() ) {
|
||||
$defaults = array( 'menu' => '', 'menu_class' => 'menu', 'context' => 'frontend',
|
||||
'fallback_cb' => '', 'before_link' => '', 'after_link' => '', 'before_title' => '', 'after_title' => '', );
|
||||
$defaults = array( 'menu' => '', 'menu_class' => 'menu', 'context' => 'frontend', 'depth' => 0,
|
||||
'fallback_cb' => '', 'walker' => '', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', );
|
||||
|
||||
$args = wp_parse_args( $args, $defaults );
|
||||
$args = apply_filters( 'wp_get_nav_menu_args', $args );
|
||||
@@ -93,54 +92,27 @@ function wp_get_nav_menu( $args = array() ) {
|
||||
// Variable setup
|
||||
$nav_menu = '';
|
||||
$items = '';
|
||||
$current_parent = 0;
|
||||
$parent_stack = array();
|
||||
$parent_menu_order = array();
|
||||
|
||||
// Get the menu object
|
||||
$menu = wp_get_nav_menu_object( $args->menu );
|
||||
|
||||
// If the menu exists, get it's items.
|
||||
if ( $menu && !is_wp_error($menu) )
|
||||
$menu_items = wp_get_nav_menu_items( $menu->term_id, 'backend' );
|
||||
$menu_items = wp_get_nav_menu_items( $menu->term_id, $args->context );
|
||||
|
||||
// If no menu was found or if the menu has no items, call the fallback_cb
|
||||
if ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) ) {
|
||||
if ( function_exists($args->fallback_cb) ) {
|
||||
$_args = array_merge( (array)$args, array('echo' => false) );
|
||||
if ( function_exists($args->fallback_cb) || is_callable( $args->fallback_cb ) ) {
|
||||
$_args = array_merge( (array) $args, array('echo' => false) );
|
||||
return call_user_func( $args->fallback_cb, $_args );
|
||||
}
|
||||
}
|
||||
|
||||
// Set up the $menu_item variables
|
||||
foreach ( (array) $menu_items as $key => $menu_item )
|
||||
$menu_items[$menu_item->menu_order] = wp_setup_nav_menu_item( $menu_item, 'frontend' );
|
||||
|
||||
foreach ( $menu_items as $key => $menu_item ) {
|
||||
// Set up the $menu_item variables
|
||||
$menu_item = wp_setup_nav_menu_item( $menu_item, 'frontend' );
|
||||
|
||||
$type = $menu_item->append;
|
||||
$maybe_value = 'frontend' == $args->context ? '' : ' value="'. $menu_item->ID .'"';
|
||||
$classes = 'frontend' == $args->context ? ' class="menu-item-type-'. $type . $menu_item->li_class .'"' : '';
|
||||
|
||||
$items .= '<li id="menu-item-'. $menu_item->ID .'"'. $maybe_value . $classes .'>';
|
||||
$items .= wp_get_nav_menu_item( $menu_item, $args->context, $args );
|
||||
|
||||
// Indent children
|
||||
$last_item = ( count( $menu_items ) == $menu_item->menu_order );
|
||||
if ( $last_item || $current_parent != $menu_items[$key + 1]->post_parent ) {
|
||||
if ( $last_item || in_array( $menu_items[$key + 1]->post_parent, $parent_stack ) ) {
|
||||
$items .= '</li>';
|
||||
while ( !empty( $parent_stack ) && ($last_item || $menu_items[$key + 1]->post_parent != $current_parent ) ) {
|
||||
$items .= '</ul></li>';
|
||||
$current_parent = array_pop( $parent_stack );
|
||||
}
|
||||
} else {
|
||||
array_push( $parent_stack, $current_parent );
|
||||
$current_parent = $menu_item->ID;
|
||||
$items .= '<ul class="sub-menu">';
|
||||
}
|
||||
} else {
|
||||
$items .= '</li>';
|
||||
}
|
||||
}
|
||||
$items .= walk_nav_menu_tree( $menu_items, $args->depth, $args );
|
||||
|
||||
// CSS class
|
||||
$ul_class = $args->menu_class ? ' class="'. $args->menu_class .'"' : '';
|
||||
@@ -174,93 +146,68 @@ function wp_get_nav_menu_item( $menu_item, $context = 'frontend', $args = array(
|
||||
$output = '';
|
||||
switch ( $context ) {
|
||||
case 'frontend':
|
||||
$attributes = ( isset($menu_item->anchor_title) && '' != $menu_item->anchor_title ) ? ' title="'. esc_attr($menu_item->anchor_title) .'"' : '';
|
||||
$attributes = ( isset($menu_item->attr_title) && '' != $menu_item->attr_title ) ? ' title="'. esc_attr($menu_item->attr_title) .'"' : '';
|
||||
$attributes .= ( isset($menu_item->target) && '' != $menu_item->target ) ? ' target="'. esc_attr($menu_item->target) .'"' : '';
|
||||
$attributes .= ( isset($menu_item->classes) && '' != $menu_item->classes ) ? ' class="'. esc_attr($menu_item->classes) .'"' : '';
|
||||
$attributes .= ( isset($menu_item->xfn) && '' != $menu_item->xfn ) ? ' rel="'. esc_attr($menu_item->xfn) .'"' : '';
|
||||
$attributes .= ( isset($menu_item->url) && '' != $menu_item->url ) ? ' href="'. esc_attr($menu_item->url) .'"' : '';
|
||||
|
||||
$output .= esc_html( $args->before_link );
|
||||
$output .= esc_html( $args->before );
|
||||
$output .= '<a'. $attributes .'>';
|
||||
$output .= esc_html( $args->before_title . $menu_item->title . $args->after_title );
|
||||
$output .= esc_html( $args->link_before . apply_filters('the_title', $menu_item->title) . $args->link_after );
|
||||
$output .= '</a>';
|
||||
$output .= esc_html( $args->after_link );
|
||||
$output .= esc_html( $args->after );
|
||||
|
||||
break;
|
||||
|
||||
case 'backend':
|
||||
$output .= '<dl><dt>';
|
||||
$output .= '<span class="item-title">'. esc_html($menu_item->title) .'</span>';
|
||||
$output .= '<span class="item-title">'. esc_html( $menu_item->title ) .'</span>';
|
||||
$output .= '<span class="item-controls">';
|
||||
if ( 'custom' == $menu_item->type ) {
|
||||
$label = __('Custom');
|
||||
} elseif ( 'post_type' == $menu_item->type ) {
|
||||
$type_obj = get_post_type_object($menu_item->append);
|
||||
$label = $type_obj->singular_label;
|
||||
} elseif ( 'taxonomy' == $menu_item->type ) {
|
||||
$taxonomy = get_taxonomy($menu_item->append);
|
||||
$label = $taxonomy->singular_label;
|
||||
} else {
|
||||
$label = $menu_item->append;
|
||||
}
|
||||
$output .= '<span class="item-type">'. esc_html($label) .'</span>';
|
||||
$output .= '<span class="item-type">'. esc_html( $menu_item->append ) .'</span>';
|
||||
|
||||
// Actions
|
||||
$output .= '<a class="item-edit thickbox" id="edit'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'" title="'. __('Edit Menu Item') .'" href="#TB_inline?height=540&width=300&inlineId=menu-item-settings">'. __('Edit') .'</a> | ';
|
||||
$output .= '<a class="item-delete" id="delete'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'">'. __('Delete') .'</a>';
|
||||
$output .= '<a class="item-edit thickbox" id="edit-'. esc_attr( $menu_item->ID ) .'" value="'. esc_attr( $menu_item->ID ) .'" title="'. __('Edit Menu Item') .'" href="#TB_inline?height=540&width=300&inlineId=menu-item-settings">'. __('Edit') .'</a> | ';
|
||||
$output .= '<a class="item-delete" id="delete-'. esc_attr( $menu_item->ID ) .'" value="'. esc_attr( $menu_item->ID ) .'">'. __('Delete') .'</a>';
|
||||
|
||||
$output .= '</dt></dl>';
|
||||
$output .= '</span></dt></dl>';
|
||||
|
||||
// Menu Item Settings
|
||||
$output .= '<input type="hidden" name="menu-item-db-id[]" id="menu-item-db-id'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->ID ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-object-id[]" id="menu-item-object-id'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->object_id ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-parent-id[]" id="menu-item-parent-id'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->post_parent ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-position[]" id="menu-item-position'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-type[]" id="menu-item-type'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->type ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-append[]" id="menu-item-append'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->append ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-title[]" id="menu-item-title'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->title ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-url[]" id="menu-item-url'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->url ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-description[]" id="menu-item-description'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->description ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-classes[]" id="menu-item-classes'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->classes ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-xfn[]" id="menu-item-xfn'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->xfn ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-attr-title[]" id="menu-item-attr-title'. esc_attr( $menu_item->menu_order ) .'" value="'.esc_attr( $menu_item->post_excerpt ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-target[]" id="menu-item-target'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->target ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-db-id[]" value="'. esc_attr( $menu_item->ID ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-object-id[]" value="'. esc_attr( $menu_item->object_id ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-object[]" value="'. esc_attr( $menu_item->object ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-parent-id[]" value="'. esc_attr( $menu_item->post_parent ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-position[]" value="'. esc_attr( $menu_item->menu_order ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-type[]" value="'. esc_attr( $menu_item->type ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-title[]" value="'. esc_attr( $menu_item->title ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-url[]" value="'. esc_attr( $menu_item->url ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-description[]" value="'. esc_attr( $menu_item->description ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-classes[]" value="'. esc_attr( $menu_item->classes ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-xfn[]" value="'. esc_attr( $menu_item->xfn ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-attr-title[]" value="'.esc_attr( $menu_item->post_excerpt ) .'" />';
|
||||
$output .= '<input type="hidden" name="menu-item-target[]" value="'. esc_attr( $menu_item->target ) .'" />';
|
||||
break;
|
||||
|
||||
case 'custom':
|
||||
$menu_id = 'menu-item-' . $menu_item->db_id;
|
||||
$output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
|
||||
case 'taxonomy':
|
||||
case 'post_type':
|
||||
$output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( 'menu-item-' . $menu_item->object_id ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
|
||||
|
||||
// Menu item hidden fields
|
||||
$output .= '<input type="hidden" class="menu-item-db-id" value="'. esc_attr( $menu_item->db_id ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-db-id" value="0" />';
|
||||
$output .= '<input type="hidden" class="menu-item-object-id" value="'. esc_attr( $menu_item->object_id ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-parent-id" value="'. esc_attr( $menu_item->parent_id ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-object" value="'. esc_attr( $menu_item->object ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-parent-id" value="'. esc_attr( $menu_item->post_parent ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-type" value="'. esc_attr( $menu_item->type ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-append" value="'. esc_attr( $menu_item->append ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-title" value="'. esc_attr( $menu_item->title ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-url" value="'. esc_attr( $menu_item->url ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-append" value="'. esc_attr( $menu_item->append ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-target" value="'. esc_attr( $menu_item->target ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-attr_title" value="'. esc_attr( $menu_item->attr_title ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-description" value="'. esc_attr( $menu_item->description ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-classes" value="'. esc_attr( $menu_item->classes ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-xfn" value="'. esc_attr( $menu_item->xfn ) .'" />';
|
||||
break;
|
||||
|
||||
case 'taxonomy':
|
||||
case 'post_type':
|
||||
$menu_id = 'menu-item-' . $menu_item->db_id;
|
||||
$output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
|
||||
|
||||
// Menu item hidden fields
|
||||
$output .= '<input type="hidden" class="menu-item-db-id" value="0" />';
|
||||
$output .= '<input type="hidden" class="menu-item-object-id" value="'. esc_attr( $menu_item->object_id ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-parent-id" value="'. esc_attr( $menu_item->parent_id ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-type" value="'. esc_attr( $menu_item->type ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-append" value="'. esc_attr( $menu_item->append ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-title" value="'. esc_attr( $menu_item->title ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-url" value="'. esc_attr( $menu_item->url ) .'" />';
|
||||
$output .= '<input type="hidden" class="menu-item-append" value="'. esc_attr( $menu_item->append ) .'" />';
|
||||
break;
|
||||
}
|
||||
|
||||
return $output;
|
||||
|
||||
+82
-43
@@ -8,26 +8,26 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* Returns a Navigation Menu object
|
||||
* Returns a navigation menu object.
|
||||
*
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param string $menu Menu id
|
||||
* @return mixed $menu|false
|
||||
* @return mixed $menu|false Or WP_Error
|
||||
*/
|
||||
function wp_get_nav_menu_object( $menu ) {
|
||||
return is_nav_menu( $menu );
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if Menu exists.
|
||||
* Check if navigation menu exists.
|
||||
*
|
||||
* Returns the menu object, or false if the term doesn't exist.
|
||||
*
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param int|string $menu The menu to check
|
||||
* @return mixed Menu Object, if exists.
|
||||
* @return mixed Menu Object, if it exists. Else, false or WP_Error
|
||||
*/
|
||||
function is_nav_menu( $menu ) {
|
||||
if ( !$menu )
|
||||
@@ -49,7 +49,7 @@ function is_nav_menu( $menu ) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a navigation menu.
|
||||
* Create a Navigation Menu.
|
||||
*
|
||||
* Optional args:
|
||||
* slug - the url friendly version of the nav menu.
|
||||
@@ -58,13 +58,13 @@ function is_nav_menu( $menu ) {
|
||||
*
|
||||
* @param string $menu_name Menu Name
|
||||
* @param string $args Optional.
|
||||
* @return mixed Menu object|WP_Error
|
||||
* @return mixed Menu object on sucess|WP_Error on failure
|
||||
*/
|
||||
function wp_create_nav_menu( $menu_name, $args = array() ) {
|
||||
$menu_exists = get_term_by( 'name', $menu_name, 'nav_menu' );
|
||||
|
||||
if ( $menu_exists )
|
||||
return new WP_Error( 'menu_exists', sprintf( __('A menu named “%s” already exists; please try another name.'), esc_html( $menu_exists->name ) ) );
|
||||
return new WP_Error( 'menu_exists', sprintf( __('A menu named <strong>%s</strong> already exists; please try another name.'), esc_html( $menu_exists->name ) ) );
|
||||
|
||||
if ( isset($args['slug']) )
|
||||
$slug = $args['slug'];
|
||||
@@ -76,16 +76,23 @@ function wp_create_nav_menu( $menu_name, $args = array() ) {
|
||||
if ( is_wp_error($menu) )
|
||||
return $menu;
|
||||
|
||||
return get_term( $menu['term_id'], 'nav_menu') ;
|
||||
$result = get_term( $menu['term_id'], 'nav_menu' );
|
||||
|
||||
if ( $result && !is_wp_error($result) ) {
|
||||
do_action( 'wp_create_nav_menu', $menu['term_id'] );
|
||||
return $result;
|
||||
} else {
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a navigation menu.
|
||||
* Delete a Navigation Menu.
|
||||
*
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param string $menu name|id|slug
|
||||
* @return bool true on success, else false.
|
||||
* @return mixed Menu object on sucess|WP_Error on failure
|
||||
*/
|
||||
function wp_delete_nav_menu( $menu ) {
|
||||
$menu = wp_get_nav_menu_object( $menu );
|
||||
@@ -98,11 +105,19 @@ function wp_delete_nav_menu( $menu ) {
|
||||
wp_delete_post( $item );
|
||||
}
|
||||
}
|
||||
wp_delete_term( $menu->term_id, 'nav_menu' );
|
||||
|
||||
$result = wp_delete_term( $menu->term_id, 'nav_menu' );
|
||||
|
||||
if ( $result && !is_wp_error($result) ) {
|
||||
do_action( 'wp_delete_nav_menu', $menu->term_id );
|
||||
return $result;
|
||||
} else {
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all Navigation Menu objects.
|
||||
* Returns all navigation menu objects.
|
||||
*
|
||||
* @since 3.0.0
|
||||
*
|
||||
@@ -153,62 +168,85 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds all the nav menu properties to the $menu_item.
|
||||
* Retrieve the HTML list content for nav menu items.
|
||||
*
|
||||
* @uses Walker_Nav_Menu to create HTML list content.
|
||||
* @since 2.1.0
|
||||
* @see Walker::walk() for parameters and return description.
|
||||
*/
|
||||
function walk_nav_menu_tree( $items, $depth, $r ) {
|
||||
$walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
|
||||
$args = array( $items, $depth, $r );
|
||||
|
||||
return call_user_func_array(array(&$walker, 'walk'), $args);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds all the navigation menu properties to the menu item.
|
||||
*
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param string $menu_item The menu item to modify
|
||||
* @param string $menu_item_type The menu item type (template, custom, post_type, taxonomy).
|
||||
* @param string $menu_item_type The menu item type (frontend, custom, post_type, taxonomy).
|
||||
* @param string $menu_item_object Optional. The menu item object type (post type or taxonomy).
|
||||
* @return object $menu_item The modtified menu item.
|
||||
* @return object $menu_item The modified menu item.
|
||||
*/
|
||||
function wp_setup_nav_menu_item( $menu_item, $menu_item_type = null, $menu_item_object = '' ) {
|
||||
global $wp_query;
|
||||
|
||||
switch ( $menu_item_type ) {
|
||||
case 'frontend':
|
||||
$menu_item->db_id = (int) $menu_item->ID;
|
||||
$menu_item->object_id = get_post_meta( $menu_item->ID, 'menu_item_object_id', true );
|
||||
$menu_item->parent_id = (int) $menu_item->post_parent;
|
||||
$menu_item->type = get_post_meta( $menu_item->ID, 'menu_item_type', true );
|
||||
|
||||
$menu_item->append = get_post_meta( $menu_item->ID, 'menu_item_append', true );
|
||||
|
||||
$menu_item->object_id = get_post_meta( $menu_item->ID, '_menu_item_object_id', true );
|
||||
$menu_item->object = get_post_meta( $menu_item->ID, '_menu_item_object', true );
|
||||
$menu_item->type = get_post_meta( $menu_item->ID, '_menu_item_type', true );
|
||||
|
||||
if ( 'post_type' == $menu_item->type ) {
|
||||
$object = get_post_type_object( $menu_item->object );
|
||||
$menu_item->append = $object->singular_label;
|
||||
|
||||
} elseif ( 'taxonomy' == $menu_item->type ) {
|
||||
$object = get_taxonomy( $menu_item->object );
|
||||
$menu_item->append = $object->singular_label;
|
||||
|
||||
} else {
|
||||
$menu_item->append = __('Custom');
|
||||
}
|
||||
|
||||
$menu_item->title = $menu_item->post_title;
|
||||
$menu_item->url = get_post_meta( $menu_item->ID, 'menu_item_url', true );
|
||||
$menu_item->target = get_post_meta( $menu_item->ID, 'menu_item_target', true );
|
||||
$menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
|
||||
$menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true );
|
||||
|
||||
$menu_item->attr_title = strip_tags( $menu_item->post_excerpt );
|
||||
$menu_item->description = strip_tags( $menu_item->post_content );
|
||||
|
||||
$menu_item->classes = get_post_meta( $menu_item->ID, 'menu_item_classes', true );;
|
||||
$menu_item->xfn = get_post_meta( $menu_item->ID, 'menu_item_xfn', true );
|
||||
$menu_item->li_class = ( $menu_item->object_id == $wp_query->get_queried_object_id() ) ? ' current_page_item' : '';
|
||||
$menu_item->classes = get_post_meta( $menu_item->ID, '_menu_item_classes', true );;
|
||||
$menu_item->xfn = get_post_meta( $menu_item->ID, '_menu_item_xfn', true );
|
||||
break;
|
||||
|
||||
case 'custom':
|
||||
$menu_item->db_id = (int) $menu_item->ID;
|
||||
$menu_item->db_id = 0;
|
||||
$menu_item->object_id = (int) $menu_item->ID;
|
||||
$menu_item->parent_id = (int) $menu_item->post_parent;
|
||||
$menu_item->type = 'custom'; //$menu_item_type
|
||||
$menu_item->append = 'custom';
|
||||
$menu_item->object = 'custom';
|
||||
$menu_item->type = 'custom';
|
||||
$menu_item->append = __('custom');
|
||||
|
||||
$menu_item->attr_title = strip_tags( $menu_item->post_excerpt );
|
||||
$menu_item->description = strip_tags( $menu_item->post_content );
|
||||
|
||||
$menu_item->title = $menu_item->post_title;
|
||||
$menu_item->url = get_post_meta( $menu_item->ID, 'menu_item_url', true );
|
||||
$menu_item->target = get_post_meta( $menu_item->ID, 'menu_item_target', true );
|
||||
$menu_item->url = get_post_meta( $menu_item->ID, '_menu_item_url', true );
|
||||
$menu_item->target = get_post_meta( $menu_item->ID, '_menu_item_target', true );
|
||||
$menu_item->classes = '';
|
||||
$menu_item->xfn = '';
|
||||
break;
|
||||
|
||||
case 'post_type':
|
||||
$menu_item->db_id = 0;
|
||||
$menu_item->object_id = (int) $menu_item->ID;
|
||||
$menu_item->parent_id = (int) $menu_item->post_parent;
|
||||
$menu_item->type = $menu_item_type;
|
||||
|
||||
$object = get_post_type_object( $menu_item_object );
|
||||
$menu_item->append = $object->name;
|
||||
$menu_item->object = $object->name;
|
||||
$menu_item->append = strtolower( $object->singular_label );
|
||||
|
||||
$menu_item->title = $menu_item->post_title;
|
||||
$menu_item->url = get_permalink( $menu_item->ID );
|
||||
@@ -216,29 +254,30 @@ function wp_setup_nav_menu_item( $menu_item, $menu_item_type = null, $menu_item_
|
||||
|
||||
$menu_item->attr_title = '';
|
||||
$menu_item->description = strip_tags( $menu_item->post_content );
|
||||
$menu_item->classes = '';
|
||||
$menu_item->xfn = '';
|
||||
break;
|
||||
|
||||
case 'taxonomy':
|
||||
$menu_item->ID = $menu_item->term_id;
|
||||
$menu_item->db_id = 0;
|
||||
$menu_item->object_id = (int) $menu_item->term_id;
|
||||
$menu_item->parent_id = (int) $menu_item->parent;
|
||||
$menu_item->post_parent = (int) $menu_item->parent;
|
||||
$menu_item->type = $menu_item_type;
|
||||
|
||||
$object = get_taxonomy( $menu_item_object );
|
||||
$menu_item->append = $object->name;
|
||||
$menu_item->object = $object->name;
|
||||
$menu_item->append = strtolower( $object->singular_label );
|
||||
|
||||
$menu_item->title = $menu_item->name;
|
||||
$menu_item->url = get_term_link( $menu_item, $menu_item_object );
|
||||
$menu_item->target = '_self';
|
||||
$menu_item->attr_title = '';
|
||||
$menu_item->description = strip_tags( $menu_item->description );
|
||||
$menu_item->classes = '';
|
||||
$menu_item->xfn = '';
|
||||
break;
|
||||
}
|
||||
|
||||
$menu_item->classes = get_post_meta( $menu_item->ID, 'menu_item_classes', true );
|
||||
$menu_item->xfn = get_post_meta( $menu_item->ID, 'menu_item_xfn', true );
|
||||
|
||||
}
|
||||
return $menu_item;
|
||||
}
|
||||
?>
|
||||
@@ -63,7 +63,9 @@ function create_initial_post_types() {
|
||||
'query_var' => false,
|
||||
) );
|
||||
|
||||
register_post_type( 'nav_menu_item', array( 'public' => false,
|
||||
register_post_type( 'nav_menu_item', array( 'label' => __('Navigation Menu Items'),
|
||||
'singular_label' => __('Navigation Menu Item'),
|
||||
'public' => false,
|
||||
'show_ui' => false,
|
||||
'_builtin' => true,
|
||||
'capability_type' => 'post',
|
||||
|
||||
@@ -397,11 +397,9 @@ function wp_default_scripts( &$scripts ) {
|
||||
) );
|
||||
|
||||
// Custom Navigation
|
||||
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100317b' );
|
||||
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", false, '20100322' );
|
||||
$scripts->localize( 'nav-menu', 'navMenuL10n', array(
|
||||
'custom' => _x('Custom', 'menu nav item type'),
|
||||
'page' => _x('Page', 'menu nav item type'),
|
||||
'category' => _x('Category', 'menu nav item type'),
|
||||
'thickbox' => _x('Edit Menu Item', 'Thickbox Title'),
|
||||
'edit' => _x('Edit', 'menu item edit text'),
|
||||
'warnDelete' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
|
||||
@@ -410,7 +408,6 @@ function wp_default_scripts( &$scripts ) {
|
||||
$scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), '20100321' );
|
||||
$scripts->add_data( 'custom-background', 'group', 1 );
|
||||
// See wp_just_in_time_script_localization() for translation data for this object
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -39,6 +39,8 @@ function create_initial_taxonomies() {
|
||||
) ) ;
|
||||
|
||||
register_taxonomy( 'nav_menu', 'nav_menu_item', array( 'hierarchical' => false,
|
||||
'label' => __('Navigation Menus'),
|
||||
'singular_label' => __('Navigation Menu'),
|
||||
'query_var' => false,
|
||||
'rewrite' => false,
|
||||
'show_ui' => false,
|
||||
|
||||
@@ -15,7 +15,7 @@ $wp_version = '3.0-alpha';
|
||||
*
|
||||
* @global int $wp_db_version
|
||||
*/
|
||||
$wp_db_version = 13576;
|
||||
$wp_db_version = 13802;
|
||||
|
||||
/**
|
||||
* Holds the TinyMCE version
|
||||
|
||||
Reference in New Issue
Block a user