WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-16 11:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert [59177].

Browse Source 
This was the wrong version of the patch.

Unprops @joedolson.
Built from https://develop.svn.wordpress.org/trunk@59178


git-svn-id: http://core.svn.wordpress.org/trunk@58573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
joedolson 2024-10-05 22:29:19 +00:00
parent ebe4e43d1c
commit 80bc458694
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wp-includes/class-walker-nav-menu.php
View File

@ -126,7 +126,6 @@ class Walker_Nav_Menu extends Walker {
* @since 4.4.0 The {@see 'nav_menu_item_args'} filter was added. * @since 4.4.0 The {@see 'nav_menu_item_args'} filter was added.
* @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id` * @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
* to match parent class for PHP 8 named parameter support. * to match parent class for PHP 8 named parameter support.
* @since 6.7.0 Removed redundant title attributes.
* *
* @see Walker::start_el() * @see Walker::start_el()
* *
@ -213,22 +212,8 @@ class Walker_Nav_Menu extends Walker {
$output .= $indent . '<li' . $li_attributes . '>'; $output .= $indent . '<li' . $li_attributes . '>';
/** This filter is documented in wp-includes/post-template.php */
$title = apply_filters( 'the_title', $menu_item->title, $menu_item->ID );
/**
* Filters a menu item's title.
*
* @since 4.4.0
*
* @param string $title The menu item's title.
* @param WP_Post $menu_item The current menu item object.
* @param stdClass $args An object of wp_nav_menu() arguments.
* @param int $depth Depth of menu item. Used for padding.
*/
$title = apply_filters( 'nav_menu_item_title', $title, $menu_item, $args, $depth );
$atts = array(); $atts = array();
$atts['title'] = ! empty( $menu_item->attr_title ) ? $menu_item->attr_title : '';
$atts['target'] = ! empty( $menu_item->target ) ? $menu_item->target : ''; $atts['target'] = ! empty( $menu_item->target ) ? $menu_item->target : '';
$atts['rel'] = ! empty( $menu_item->xfn ) ? $menu_item->xfn : ''; $atts['rel'] = ! empty( $menu_item->xfn ) ? $menu_item->xfn : '';
@ -244,14 +229,6 @@ class Walker_Nav_Menu extends Walker {
$atts['aria-current'] = $menu_item->current ? 'page' : ''; $atts['aria-current'] = $menu_item->current ? 'page' : '';
if ( ! empty( $menu_item->attr_title )
&& trim( strtolower( $menu_item->attr_title ) ) !== trim( strtolower( $title ) )
) {
$atts['title'] = $menu_item->attr_title;
} else {
$atts['title'] = '';
}
/** /**
* Filters the HTML attributes applied to a menu item's anchor element. * Filters the HTML attributes applied to a menu item's anchor element.
* *
@ -274,6 +251,21 @@ class Walker_Nav_Menu extends Walker {
$atts = apply_filters( 'nav_menu_link_attributes', $atts, $menu_item, $args, $depth ); $atts = apply_filters( 'nav_menu_link_attributes', $atts, $menu_item, $args, $depth );
$attributes = $this->build_atts( $atts ); $attributes = $this->build_atts( $atts );
/** This filter is documented in wp-includes/post-template.php */
$title = apply_filters( 'the_title', $menu_item->title, $menu_item->ID );
/**
* Filters a menu item's title.
*
* @since 4.4.0
*
* @param string $title The menu item's title.
* @param WP_Post $menu_item The current menu item object.
* @param stdClass $args An object of wp_nav_menu() arguments.
* @param int $depth Depth of menu item. Used for padding.
*/
$title = apply_filters( 'nav_menu_item_title', $title, $menu_item, $args, $depth );
$item_output = $args->before; $item_output = $args->before;
$item_output .= '<a' . $attributes . '>'; $item_output .= '<a' . $attributes . '>';
$item_output .= $args->link_before . $title . $args->link_after; $item_output .= $args->link_before . $title . $args->link_after;

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.7-beta1-59177'; $wp_version = '6.7-beta1-59178';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.