Changeset 45340

Timestamp:

05/17/2019 02:21:20 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Accessibility: In back-compat code added for get_search_form() in [44956], when checking the (previously boolean) $args value, account for non-strict comparison.

Props dkarfa, sachyya-sachet.
Fixes #47177. See #42057.

File:

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

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

@@ -210 +210 @@
     do_action( 'pre_get_search_form' );
 
-    $format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
-
-    /*
-     * Back compat: to ensure previous uses of get_search_form continue to
-     * function as expected, we handle a value for the boolean $echo param removed
-     * in 5.2.0. Then we deal with the $args array and cast its defaults.
-     */
     $echo = true;
-    if ( false === $args ) {
-        $echo = false;
-    }
 
     if ( ! is_array( $args ) ) {
+        /*
+         * Back compat: to ensure previous uses of get_search_form() continue to
+         * function as expected, we handle a value for the boolean $echo param removed
+         * in 5.2.0. Then we deal with the $args array and cast its defaults.
+         */
+        $echo = (bool) $args;
+
         // Set an empty array and allow default arguments to take over.
         $args = array();
@@ -243 +240 @@
      */
     $args = apply_filters( 'search_form_args', $args );
+
+    $format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
 
     /**