From c87fccd74f7b69375a6dd7e8a3586a4f7bb8dda4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 11 Dec 2019 22:14:02 +0000
Subject: [PATCH] Comments: Avoid a PHP notice in `comment_form()` if the
 `email` field is not set.

Follow-up to [46090].

Props mat-lipe.
Fixes #48943.
Built from https://develop.svn.wordpress.org/trunk@46885


git-svn-id: http://core.svn.wordpress.org/trunk@46685 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-template.php | 2 +-
 wp-includes/version.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 6f28e2bdb4..2ed2a32cd3 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -2433,7 +2433,7 @@ function comment_form( $args = array(), $post_id = null ) {
 	$args = array_merge( $defaults, $args );
 
 	// Remove aria-describedby from the email field if there's no associated description.
-	if ( false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
+	if ( isset( $args['fields']['email'] ) && false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
 		$args['fields']['email'] = str_replace(
 			' aria-describedby="email-notes"',
 			'',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1538c3055b..7d37252a57 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-46883';
+$wp_version = '5.4-alpha-46885';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.