Changeset 23801

Timestamp:

03/26/2013 11:18:43 PM (11 years ago)

Author:

azaozz

Message:

In the HTML outputted from get_search_form(): increment the ID connecting <label> to <input> when the function is called multiple times, remove the form and submit button IDs for HTML 5.0 and for XHTML after the first call. Props WraithKenny, fixes #16539

File:

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

trunk/wp-includes/general-template.php

@@ -154 +154 @@
  */
 function get_search_form( $echo = true ) {
+    static $search_form_counter = 0;
+
     do_action( 'pre_get_search_form' );
 
     $format = apply_filters( 'search_form_format', 'xhtml' );
+
+    // Initialize the values
+    $form_id   = $search_form_counter ? '' : ' id="searchform"';
+    $submit_id = $search_form_counter ? '' : ' id="searchsubmit"';
+    $text_id   = $search_form_counter ? 's-' . $search_form_counter : 's';
 
     $search_form_template = locate_template( 'searchform.php' );
@@ -164 +171 @@
         $form = ob_get_clean();
     } else {
-        $type        = ( 'html5' === $format ) ? 'search' : 'text';
-        $placeholder = ( 'html5' === $format ) ? 'placeholder="' . esc_attr_x( 'Search …', 'placeholder' ) . '" ' : '';
-
-        $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="' . $type . '" ' . $placeholder . 'value="' . get_search_query() . '" name="s" id="s" />
-                <input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
-            </div>
-        </form>';
+        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>';
+        }
     }
 
@@ -179 +194 @@
     if ( null === $result )
         $result = $form;
+
+    $search_form_counter++;
 
     if ( $echo )