Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.248
diff -u -r1.248 theme.inc
--- includes/theme.inc	29 Jul 2005 07:49:43 -0000	1.248
+++ includes/theme.inc	30 Jul 2005 12:11:15 -0000
@@ -996,6 +996,18 @@
 
 
 /**
+ * Return the standard default search form.
+ *
+ */
+function theme_search_form() {
+  $output = "<div id=\"search\">\n";
+  $output .= "  <input class=\"form-text\" type=\"text\" size=\"15\" value=\"\" name=\"edit[keys]\" alt=\"". t('Enter the terms you wish to search for.'). "\" />\n";
+  $output .= "  <input class=\"form-submit\" type=\"submit\" value=\"". t('search'). "\" />\n";
+  $output .= "</div>\n";
+  return form($output, 'post', url('search'));
+}
+
+/**
  * @} End of "defgroup themeable".
  */
 
Index: themes/bluemarine/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/page.tpl.php,v
retrieving revision 1.4
diff -u -r1.4 page.tpl.php
--- themes/bluemarine/page.tpl.php	21 May 2005 11:38:32 -0000	1.4
+++ themes/bluemarine/page.tpl.php	30 Jul 2005 12:11:15 -0000
@@ -22,12 +22,7 @@
     <td id="menu">
       <div id="secondary"><?php print theme('links', $secondary_links) ?></div>
       <div id="primary"><?php print theme('links', $primary_links) ?></div>
-      <?php if ($search_box) { ?><form action="<?php print $search_url ?>" method="post">
-        <div id="search">
-          <input class="form-text" type="text" size="15" value="" name="edit[keys]" alt="<?php print $search_description ?>" />
-          <input class="form-submit" type="submit" value="<?php print $search_button_text ?>" />
-        </div>
-      </form><?php } ?>
+      <?php print $search_form ?>
     </td>
   </tr>
 </table>
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.8
diff -u -r1.8 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	25 Jul 2005 06:59:37 -0000	1.8
+++ themes/engines/phptemplate/phptemplate.engine	30 Jul 2005 12:11:15 -0000
@@ -162,10 +162,7 @@
     'logo'                => theme_get_setting('logo'),
     'site_name'           => (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''),
     'site_slogan'         => (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''),
-    'search_box'          => theme_get_setting('toggle_search'),
-    'search_url'          => url('search'),
-    'search_button_text'  => t('search'),
-    'search_description'  => t('Enter the terms you wish to search for.'),
+    'search_form'         => (theme_get_setting('toggle_search') ? theme('search_form') : ''),
     'title'               => drupal_get_title(),
     'primary_links'       => theme_get_setting('primary_links'),
     'secondary_links'     => theme_get_setting('secondary_links'),
Index: themes/pushbutton/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/page.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 page.tpl.php
--- themes/pushbutton/page.tpl.php	6 May 2005 08:39:30 -0000	1.3
+++ themes/pushbutton/page.tpl.php	30 Jul 2005 12:11:15 -0000
@@ -53,14 +53,7 @@
       <?php endif; ?>
     </td>
     <td  width="25%"  align="center" valign="middle">
-      <?php if ($search_box): ?>
-      <form action="<?php print $search_url ?>" method="post">
-        <div id="search">
-          <input class="form-text" type="text" size="15" value="" name="edit[keys]" alt="<?php print $search_description ?>" />
-          <input class="form-submit" type="submit" value="<?php print $search_button_text ?>" alt="submit" />
-        </div>
-      </form>
-      <?php endif; ?>
+      <?php print $search_form ?>
     </td>
     </tr>
 </table>