Changeset 49356 for branches/5.5/src/wp-includes/general-template.php

Timestamp:

10/28/2020 05:07:18 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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

Props kellybleck, davidbaumwald, whyisjake, SergeyBiryukov.
Merges [49355] to the 5.5 branch.
Fixes #51645.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-includes/general-template.php (modified) (2 diffs)

branches/5.5/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 {