Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-23 05:15:00 +02:00
Code Issues Projects Releases Wiki Activity

Comments: Avoid a PHP notice in comment_form() if the email field is not set.

Browse Source 
Follow-up to [46090].

Props mat-lipe.
Merges [46885] to the 5.3 branch.
Fixes #48943.
Built from https://develop.svn.wordpress.org/branches/5.3@46886


git-svn-id: http://core.svn.wordpress.org/branches/5.3@46686 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-12-11 22:16:03 +00:00
parent 9e38fc8259
commit c7d610fb02
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/comment-template.php
View File

@ -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"',
'',

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.3.1-RC1-46884';
$wp_version = '5.3.1-RC1-46886';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.