Ticket #49553: 49553.diff

src/wp-includes/general-template.php

@@ -192 +192 @@
  *     Optional. Array of display arguments.
  *
  *     @type bool   $echo       Whether to echo or return the form. Default true.
+ *     @type bool   $show_query Whether to show the search query. Default true.
  *     @type string $aria_label ARIA label for the search form. Useful to distinguish
  *                              multiple search forms on the same page and improve
  *                              accessibility. Default empty.
@@ -223 +224 @@
                 $args = array();
         }
 
-        // Defaults are to echo and to output no custom label on the form.
+        // Defaults are to echo, show current search query and to output no custom label on the form.
         $defaults = array(
                 'echo'       => $echo,
+                'show_query' => true,
                 'aria_label' => '',
         );
 
@@ -272 +274 @@
                         $form = '<form role="search" ' . $aria_label . 'method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">
                                 <label>
                                         <span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
-                                        <input type="search" class="search-field" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" />
+                                        <input type="search" class="search-field" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . ( $args['show_query'] ? get_search_query() : '' ) . '" name="s" />
                                 </label>
                                 <input type="submit" class="search-submit" value="' . esc_attr_x( 'Search', 'submit button' ) . '" />
                         </form>';
@@ -280 +282 @@
                         $form = '<form role="search" ' . $aria_label . 'method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
                                 <div>
                                         <label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
-                                        <input type="text" value="' . get_search_query() . '" name="s" id="s" />
+                                        <input type="text" value="' . ( $args['show_query'] ? get_search_query() : '' ) . '" name="s" id="s" />
                                         <input type="submit" id="searchsubmit" value="' . esc_attr_x( 'Search', 'submit button' ) . '" />
                                 </div>
                         </form>';