Changeset 23799

Timestamp:

03/26/2013 08:34:37 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: remove HTML5 argument for search form, using a filter instead. See #23850, closes #23701.

Location:

trunk/wp-content/themes/twentythirteen

Files:

• 404.php (modified) (1 diff)
• content-none.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• header.php (modified) (1 diff)

trunk/wp-content/themes/twentythirteen/404.php

@@ -22 +22 @@
                     <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen' ); ?></p>
 
-                    <?php get_search_form( true, 'html5' ); ?>
+                    <?php get_search_form(); ?>
                 </div><!-- .page-content -->
             </div><!-- .page-wrapper -->

trunk/wp-content/themes/twentythirteen/content-none.php

@@ -21 +21 @@
 
     <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with different keywords.', 'twentythirteen' ); ?></p>
-    <?php get_search_form( true, 'html5' ); ?>
+    <?php get_search_form(); ?>
 
     <?php else : ?>
 
     <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentythirteen' ); ?></p>
-    <?php get_search_form( true, 'html5' ); ?>
+    <?php get_search_form(); ?>
 
     <?php endif; ?>

trunk/wp-content/themes/twentythirteen/functions.php

@@ -547 +547 @@
 
 /**
+ * Switches default core markup for search form to output valid HTML5.
+ *
+ * @param string $format Expected markup format, default is `xhtml`
+ * @return string Twenty Thirteen loves HTML5.
+ */
+function twentythirteen_searchform_format( $format ) {
+    return 'html5';
+}
+add_filter( 'search_form_format', 'twentythirteen_searchform_format' );
+
+/**
  * Add postMessage support for site title and description for the Customizer.
  *

trunk/wp-content/themes/twentythirteen/header.php

@@ -52 +52 @@
                     <a class="screen-reader-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
                     <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
-                    <?php get_search_form( true, 'html5' ); ?>
+                    <?php get_search_form(); ?>
                 </nav><!-- #site-navigation -->
             </div><!-- #navbar -->