Ticket #7910: get_search_tag.2.diff

wp-content/themes/default/searchform.php

@@ -1 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Default_Theme
- */
-?>
-<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
-<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
-<div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
-<input type="submit" id="searchsubmit" value="Search" />
-</div>
-</form>

wp-includes/general-template.php

@@ -93 +93 @@
                 load_template( get_theme_root() . '/default/sidebar.php');
 }
 
+function get_search_form() {
+        do_action( 'get_search' );
+        if('' == locate_template(array('searchform.php'), true))
+        {
+                $form = '<form method="get" id="searchform" action="' . get_option('siteurl') . '/" >
+                <label class="hidden" for="s">' . __('Search for:') . '</label>
+                <div><input type="text" value="' . the_search_query() . '" name="s" id="s" />
+                <input type="submit" id="searchsubmit" value="Search" />
+                </div>
+                </form>';
+        }
+        echo apply_filters('get_searchform', $form);
+}
+
 /**
  * Display the Log In/Out link.
  *

wp-includes/widgets.php

@@ -763 +763 @@
  */
 function wp_widget_search($args) {
         extract($args);
-        $searchform_template = get_template_directory() . '/searchform.php';
-
         echo $before_widget;
 
         // Use current theme search form if it exists
-        if ( file_exists($searchform_template) ) {
-                include_once($searchform_template);
-        } else { ?>
-                <form id="searchform" method="get" action="<?php bloginfo('url'); ?>/"><div>
-                        <label class="hidden" for="s"><?php _e('Search for:'); ?></label>
-                        <input type="text" name="s" id="s" size="15" value="<?php the_search_query(); ?>" />
-                        <input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" />
-                </div></form>
-        <?php }
-
+        get_search_form();
+        
         echo $after_widget;
 }