From abe3ec288ba9cc4e3f8131e57e4721eff50dfad8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 4 Jul 2019 09:23:55 +0000
Subject: [PATCH] Twenty Nineteen: Fix markup errors in
 `twentynineteen_add_ellipses_to_nav()`:

* Add missing i18n for `aria-label` attribute.
* Remove redundant screen reader text superseded by `aria-label`.
* Remove unnecessary `id` and `class` attributes.

Props afercia, chetan200891, ianbelanger.
Fixes #47067.
Built from https://develop.svn.wordpress.org/trunk@45596


git-svn-id: http://core.svn.wordpress.org/trunk@45407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentynineteen/inc/template-functions.php | 6 +++---
 wp-includes/version.php                                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-content/themes/twentynineteen/inc/template-functions.php b/wp-content/themes/twentynineteen/inc/template-functions.php
index 90df660012..a5c004615e 100644
--- a/wp-content/themes/twentynineteen/inc/template-functions.php
+++ b/wp-content/themes/twentynineteen/inc/template-functions.php
@@ -206,12 +206,12 @@ function twentynineteen_add_ellipses_to_nav( $nav_menu, $args ) {
 			<div class="main-menu-more">
 				<ul class="main-menu">
 					<li class="menu-item menu-item-has-children">
-						<button class="submenu-expand main-menu-more-toggle is-empty" tabindex="-1" aria-label="More" aria-haspopup="true" aria-expanded="false">
-							<span class="screen-reader-text">' . esc_html__( 'More', 'twentynineteen' ) . '</span>' .
+						<button class="submenu-expand main-menu-more-toggle is-empty" tabindex="-1"
+							aria-label="' . esc_attr__( 'More', 'twentynineteen' ) . '" aria-haspopup="true" aria-expanded="false">' .
 							twentynineteen_get_icon_svg( 'arrow_drop_down_ellipsis' ) . '
 						</button>
 						<ul class="sub-menu hidden-links">
-							<li id="menu-item--1" class="mobile-parent-nav-menu-item menu-item--1">
+							<li class="mobile-parent-nav-menu-item">
 								<button class="menu-item-link-return">' .
 									twentynineteen_get_icon_svg( 'chevron_left' ) .
 									esc_html__( 'Back', 'twentynineteen' ) . '
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2dea6573f4..c4543a7e88 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45595';
+$wp_version = '5.3-alpha-45596';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.