From 80bc4586943d75d29bd95a986db473f7262427b6 Mon Sep 17 00:00:00 2001
From: joedolson <joedolson@git.wordpress.org>
Date: Sat, 5 Oct 2024 22:29:19 +0000
Subject: [PATCH] Revert [59177].

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
---
 wp-includes/class-walker-nav-menu.php | 40 +++++++++++----------------
 wp-includes/version.php               |  2 +-
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/wp-includes/class-walker-nav-menu.php b/wp-includes/class-walker-nav-menu.php
index 7faa2d7d76..37147e48ce 100644
--- a/wp-includes/class-walker-nav-menu.php
+++ b/wp-includes/class-walker-nav-menu.php
@@ -126,7 +126,6 @@ class Walker_Nav_Menu extends Walker {
 	 * @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`
 	 *              to match parent class for PHP 8 named parameter support.
-	 * @since 6.7.0 Removed redundant title attributes.
 	 *
 	 * @see Walker::start_el()
 	 *
@@ -213,22 +212,8 @@ class Walker_Nav_Menu extends Walker {
 
 		$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['title']  = ! empty( $menu_item->attr_title ) ? $menu_item->attr_title : '';
 		$atts['target'] = ! empty( $menu_item->target ) ? $menu_item->target : '';
 		$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' : '';
 
-		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.
 		 *
@@ -274,6 +251,21 @@ class Walker_Nav_Menu extends Walker {
 		$atts       = apply_filters( 'nav_menu_link_attributes', $atts, $menu_item, $args, $depth );
 		$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 .= '<a' . $attributes . '>';
 		$item_output .= $args->link_before . $title . $args->link_after;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4d30ed89c5..5bd1efe87c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @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.