WordPress.org

Make WordPress Core

Changeset 49355


Ignore:
Timestamp:
10/28/2020 04:55:42 PM (4 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/comment-template.php

    r49256 r49355  
    25002500    $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
    25012501
    2502     // Ensure that the filtered args contain all required default values.
     2502    // Ensure that the filtered arguments contain all required default values.
    25032503    $args = array_merge( $defaults, $args );
    25042504
  • trunk/src/wp-includes/general-template.php

    r49193 r49355  
    282282    $args = apply_filters( 'search_form_args', $args );
    283283
     284    // Ensure that the filtered arguments contain all required default values.
     285    $args = array_merge( $defaults, $args );
     286
    284287    $format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
    285288
     
    304307    } else {
    305308        // Build a string containing an aria-label to use for the search form.
    306         if ( isset( $args['aria_label'] ) && $args['aria_label'] ) {
     309        if ( $args['aria_label'] ) {
    307310            $aria_label = 'aria-label="' . esc_attr( $args['aria_label'] ) . '" ';
    308311        } else {
Note: See TracChangeset for help on using the changeset viewer.