Changeset 49355

Timestamp:

10/28/2020 04:55:42 PM (6 years ago)

Author:

SergeyBiryukov

Message:

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

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

Location:

trunk/src/wp-includes

Files:

• comment-template.php (modified) (1 diff)
• general-template.php (modified) (2 diffs)

trunk/src/wp-includes/comment-template.php

@@ -2500 +2500 @@
         $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 );
 

trunk/src/wp-includes/general-template.php

@@ -282 +282 @@
         $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';
 
@@ -304 +307 @@
         } 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 {