Ticket #16539: 16539-5.WCAG.2.patch

wp-includes/general-template.php

@@ -159 +159 @@
                 require( $search_form_template );
                 $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" 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>';
+                }
         }
 
         if ( $echo )