diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 5f692a1e26..f00d1fad64 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -17,29 +17,33 @@ class Walker_Nav_Menu extends Walker { /** * What the class handles. * - * @see Walker::$tree_type * @since 3.0.0 + * @access public * @var string + * + * @see Walker::$tree_type */ public $tree_type = array( 'post_type', 'taxonomy', 'custom' ); /** * Database fields to use. * - * @see Walker::$db_fields * @since 3.0.0 + * @access public * @todo Decouple this. * @var array + * + * @see Walker::$db_fields */ public $db_fields = array( 'parent' => 'menu_item_parent', 'id' => 'db_id' ); /** * Starts the list before the elements are added. * - * @see Walker::start_lvl() - * * @since 3.0.0 * + * @see Walker::start_lvl() + * * @param string $output Passed by reference. Used to append additional content. * @param int $depth Depth of menu item. Used for padding. * @param array $args An array of wp_nav_menu() arguments. @@ -52,10 +56,10 @@ class Walker_Nav_Menu extends Walker { /** * Ends the list of after the elements are added. * - * @see Walker::end_lvl() - * * @since 3.0.0 * + * @see Walker::end_lvl() + * * @param string $output Passed by reference. Used to append additional content. * @param int $depth Depth of menu item. Used for padding. * @param array $args An array of wp_nav_menu() arguments. @@ -68,11 +72,11 @@ class Walker_Nav_Menu extends Walker { /** * Starts the element output. * - * @see Walker::start_el() - * * @since 3.0.0 * @since 4.4.0 The {@see 'nav_menu_item_args'} filter was added. * + * @see Walker::start_el() + * * @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. @@ -201,10 +205,10 @@ class Walker_Nav_Menu extends Walker { /** * Ends the element output, if needed. * - * @see Walker::end_el() - * * @since 3.0.0 * + * @see Walker::end_el() + * * @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. diff --git a/wp-includes/version.php b/wp-includes/version.php index 0d30cd4b35..39e150e7b7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37638'; +$wp_version = '4.6-alpha-37639'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.