sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

General: Ensure that filtered arguments in `get_search_form()` contain all required default values. 

Props kellybleck, davidbaumwald, whyisjake, SergeyBiryukov.
Fixes #51645.

git-svn-id: https://develop.svn.wordpress.org/trunk@49355 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-10-28 16:55:42 +00:00
parent 4f6eee8e72
commit 82227c9fa6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2499,7 +2499,7 @@ function comment_form( $args = array(), $post_id = null ) {
*/
$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
// Ensure that the filtered args contain all required default values.
// Ensure that the filtered arguments contain all required default values.
$args = array_merge( $defaults, $args );
// Remove `aria-describedby` from the email field if there's no associated description.

5
src/wp-includes/general-template.php
View File

@ -281,6 +281,9 @@ function get_search_form( $args = array() ) {
*/
$args = apply_filters( 'search_form_args', $args );
// Ensure that the filtered arguments contain all required default values.
$args = array_merge( $defaults, $args );
$format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
/**
@ -303,7 +306,7 @@ function get_search_form( $args = array() ) {
$form = ob_get_clean();
} else {
// Build a string containing an aria-label to use for the search form.
if ( isset( $args['aria_label'] ) && $args['aria_label'] ) {
if ( $args['aria_label'] ) {
$aria_label = 'aria-label="' . esc_attr( $args['aria_label'] ) . '" ';
} else {
/*