WordPress.org
Get WordPress

Make WordPress Core

Ticket #7910: get_search_tag.4.diff

File get_search_tag.4.diff, 4.7 KB (added by technosailor, 17 years ago)

Unified patch wrapping in all patch updates

  • wp-content/themes/default/searchform.php

     
    1 <?php
    2 /**
    3  * @package WordPress
    4  * @subpackage Default_Theme
    5  */
    6 ?>
    7 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
    8 <label class="hidden" for="s"><?php _e('Search for:'); ?></label>
    9 <div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
    10 <input type="submit" id="searchsubmit" value="Search" />
    11 </div>
    12 </form>

  • wp-content/themes/default/archives.php

     
    1212
    1313<div id="content" class="widecolumn">
    1414
    15 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
     15<?php get_search_form(); ?>
    1616
    1717<h2>Archives by Month:</h2>
    1818        <ul>

  • wp-content/themes/default/search.php

     
    3737        <?php else : ?>
    3838
    3939                <h2 class="center">No posts found. Try a different search?</h2>
    40                 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
     40                <?php get_search_form(); ?>
    4141
    4242        <?php endif; ?>
    4343

  • wp-content/themes/default/index.php

     
    3434
    3535                <h2 class="center">Not Found</h2>
    3636                <p class="center">Sorry, but you are looking for something that isn't here.</p>
    37                 <?php include (TEMPLATEPATH . "/searchform.php"); ?>
     37                <?php get_search_form(); ?>
    3838
    3939        <?php endif; ?>
    4040

  • wp-content/themes/default/sidebar.php

     
    99                        <?php   /* Widgetized sidebar, if you have the plugin installed. */
    1010                                        if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
    1111                        <li>
    12                                 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
     12                                <?php get_search_form(); ?>
    1313                        </li>
    1414
    1515                        <!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it.

  • wp-content/themes/default/archive.php

     
    6363                        printf("<h2 class='center'>Sorry, but there aren't any posts by %s yet.</h2>", get_userdatabylogin(get_query_var('author_name'))->display_name);
    6464                else
    6565                        echo("<h2 class='center'>No posts found.</h2>");
    66                 include (TEMPLATEPATH . '/searchform.php');
     66                get_search_form();
    6767
    6868        endif;
    6969?>

  • wp-includes/general-template.php

     
    9393                load_template( get_theme_root() . '/default/sidebar.php');
    9494}
    9595
     96function get_search_form() {
     97        do_action( 'get_search' );
     98        if('' == locate_template(array('searchform.php'), true))
     99        {
     100                $form = '<form method="get" id="searchform" action="' . get_option('siteurl') . '/" >
     101                <label class="hidden" for="s">' . __('Search for:') . '</label>
     102                <div><input type="text" value="' . the_search_query() . '" name="s" id="s" />
     103                <input type="submit" id="searchsubmit" value="Search" />
     104                </div>
     105                </form>';
     106        }
     107        echo apply_filters('get_searchform', $form);
     108}
     109
    96110/**
    97111 * Display the Log In/Out link.
    98112 *

  • wp-includes/widgets.php

     
    763763 */
    764764function wp_widget_search($args) {
    765765        extract($args);
    766         $searchform_template = get_template_directory() . '/searchform.php';
    767 
    768766        echo $before_widget;
    769767
    770768        // Use current theme search form if it exists
    771         if ( file_exists($searchform_template) ) {
    772                 include_once($searchform_template);
    773         } else { ?>
    774                 <form id="searchform" method="get" action="<?php bloginfo('url'); ?>/"><div>
    775                         <label class="hidden" for="s"><?php _e('Search for:'); ?></label>
    776                         <input type="text" name="s" id="s" size="15" value="<?php the_search_query(); ?>" />
    777                         <input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" />
    778                 </div></form>
    779         <?php }
    780 
     769        get_search_form();
     770       
    781771        echo $after_widget;
    782772}
    783773