Ticket #16539: 16539.9.diff

wp-includes/general-template.php

@@ -171 +171 @@
                 $form = ob_get_clean();
         } else {
                 if ( 'html5' == $format ) {
-                        $form = '<form role="search" method="get" class="searchform" action="' . esc_url( home_url( '/' ) ) . '"> 
-                                <div> 
-                                        <label><span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span> 
-                                                <input type="search" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" title="' . _x( 'Search for:', 'label' ) . '" /> 
-                                        </label> 
-                                        <input type="submit" class="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" /> 
-                                </div> 
-                        </form>'; 
-                } else { 
-                        $form = '<form role="search" method="get"' . $form_id . ' class="searchform" action="' . esc_url( home_url( '/' ) ) . '"> 
-                                <div> 
-                                        <label class="screen-reader-text" for="' . $text_id . '">' . _x( 'Search for:', 'label' ) . '</label> 
-                                        <input type="text" value="' . get_search_query() . '" name="s" id="' . $text_id . '" /> 
-                                        <input type="submit"' . $submit_id . ' value="'. esc_attr_x( 'Search', 'submit button' ) .'" /> 
-                                </div> 
+                        $form = '<form role="search" method="get" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
+                                <label><span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
+                                        <input type="search" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" title="' . _x( 'Search for:', 'label' ) . '" />
+                                </label>
+                                <input type="submit" class="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+                        </form>';
+                } else {
+                        $form = '<form role="search" 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="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+                                </div>
                         </form>';
                 }
         }