Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.525
diff -u -u -p -r1.525 theme.inc
--- includes/theme.inc	15 Sep 2009 20:03:18 -0000	1.525
+++ includes/theme.inc	20 Sep 2009 20:55:28 -0000
@@ -2208,7 +2208,6 @@ function template_preprocess_page(&$vari
   $variables['main_menu']         = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
   $variables['secondary_menu']    = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array();
   $variables['action_links']      = menu_local_actions();
-  $variables['search_box']        = (theme_get_setting('toggle_search') ? drupal_render(drupal_get_form('search_theme_form')) : '');
   $variables['site_name']         = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : '');
   $variables['site_slogan']       = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : '');
   $variables['tabs']              = theme('menu_local_tasks');
@@ -2357,7 +2356,6 @@ function template_preprocess_maintenance
   $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
   $variables['main_menu']         = array();
   $variables['secondary_menu']    = array();
-  $variables['search_box']        = '';
   $variables['site_name']         = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
   $variables['site_slogan']       = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : '');
   $variables['css']               = drupal_add_css();
Index: modules/search/search-theme-form.tpl.php
===================================================================
RCS file: modules/search/search-theme-form.tpl.php
diff -N modules/search/search-theme-form.tpl.php
--- modules/search/search-theme-form.tpl.php	30 Dec 2008 16:43:18 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-<?php
-// $Id: search-theme-form.tpl.php,v 1.3 2008/12/30 16:43:18 dries Exp $
-
-/**
- * @file
- * Default theme implementation for displaying a search form directly into the
- * theme layout. Not to be confused with the search block or the search page.
- *
- * Available variables:
- * - $search_form: The complete search form ready for print.
- * - $search: Array of keyed search elements. Can be used to print each form
- *   element separately.
- *
- * Default keys within $search:
- * - $search['search_theme_form']: Text input area wrapped in a div.
- * - $search['submit']: Form submit button.
- * - $search['hidden']: Hidden form elements. Used to validate forms when submitted.
- *
- * Since $search is keyed, a direct print of the form element is possible.
- * Modules can add to the search form so it is recommended to check for their
- * existence before printing. The default keys will always exist.
- *
- *   <?php if (isset($search['extra_field'])): ?>
- *     <div class="extra-field">
- *       <?php print $search['extra_field']; ?>
- *     </div>
- *   <?php endif; ?>
- *
- * To check for all available data within $search, use the code below.
- *
- *   <?php print '<pre>'. check_plain(print_r($search, 1)) .'</pre>'; ?>
- *
- * @see template_preprocess_search_theme_form()
- */
-?>
-<div id="search" class="container-inline">
-  <?php print $search_form; ?>
-</div>
Index: modules/search/search.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.install,v
retrieving revision 1.23
diff -u -u -p -r1.23 search.install
--- modules/search/search.install	10 Sep 2009 06:38:19 -0000	1.23
+++ modules/search/search.install	20 Sep 2009 20:55:28 -0000
@@ -16,6 +16,13 @@ function search_uninstall() {
 }
 
 /**
+ * Implement hook_install().
+ */
+function search_install() {
+  drupal_set_message(t('You can <a href="@url">add the search block</a> now.', array('@url' => url('admin/structure/block'))));
+}
+
+/**
  * Implement hook_schema().
  */
 function search_schema() {
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.316
diff -u -u -p -r1.316 search.module
--- modules/search/search.module	20 Sep 2009 17:18:04 -0000	1.316
+++ modules/search/search.module	20 Sep 2009 20:55:28 -0000
@@ -117,10 +117,6 @@ function search_help($path, $arg) {
  */
 function search_theme() {
   return array(
-    'search_theme_form' => array(
-      'arguments' => array('form' => NULL),
-      'template' => 'search-theme-form',
-    ),
     'search_block_form' => array(
       'arguments' => array('form' => NULL),
       'template' => 'search-block-form',
@@ -892,7 +888,7 @@ function search_form($form, &$form_state
 }
 
 /**
- * Form builder; Output a search form for the search block and the theme's search box.
+ * Form builder; Output a search form for the search block's search box.
  *
  * @ingroup forms
  * @see search_box_form_submit()
@@ -930,33 +926,6 @@ function search_box_form_submit($form, &
 }
 
 /**
- * Process variables for search-theme-form.tpl.php.
- *
- * The $variables array contains the following arguments:
- * - $form
- *
- * @see search-theme-form.tpl.php
- */
-function template_preprocess_search_theme_form(&$variables) {
-  $variables['search'] = array();
-  $hidden = array();
-  // Provide variables named after form keys so themers can print each element independently.
-  foreach (element_children($variables['form']) as $key) {
-    $type = $variables['form'][$key]['#type'];
-    if ($type == 'hidden' || $type == 'token') {
-      $hidden[] = drupal_render($variables['form'][$key]);
-    }
-    else {
-      $variables['search'][$key] = drupal_render($variables['form'][$key]);
-    }
-  }
-  // Hidden form elements have no value to themers. No need for separation.
-  $variables['search']['hidden'] = implode($hidden);
-  // Collect all form elements to make it easier to print the whole form.
-  $variables['search_form'] = implode($variables['search']);
-}
-
-/**
  * Process variables for search-block-form.tpl.php.
  *
  * The $variables array contains the following arguments:
@@ -1127,10 +1096,6 @@ function _search_excerpt_replace(&$text)
 }
 
 function search_forms() {
-  $forms['search_theme_form']= array(
-    'callback' => 'search_box',
-    'callback arguments' => array('search_theme_form'),
-  );
   $forms['search_block_form']= array(
     'callback' => 'search_box',
     'callback arguments' => array('search_block_form'),
Index: modules/search/search.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.test,v
retrieving revision 1.35
diff -u -u -p -r1.35 search.test
--- modules/search/search.test	11 Sep 2009 15:39:48 -0000	1.35
+++ modules/search/search.test	20 Sep 2009 20:55:28 -0000
@@ -503,7 +503,7 @@ class SearchCommentTestCase extends Drup
 
     // Search for $title.
     $edit = array(
-      'search_theme_form' => $comment_body,
+      'search_block_form' => $comment_body,
     );
     $this->drupalPost('', $edit, t('Search'));
     $this->assertText($node->title, t('Node found in search results.'));
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.33
diff -u -u -p -r1.33 page.tpl.php
--- modules/system/page.tpl.php	15 Sep 2009 17:10:39 -0000	1.33
+++ modules/system/page.tpl.php	20 Sep 2009 20:55:28 -0000
@@ -26,7 +26,6 @@
  *   in theme settings.
  *
  * Navigation:
- * - $search_box: HTML to display the search box, empty if search has been disabled.
  * - $main_menu (array): An array containing the Main menu links for the
  *   site, if they have been configured.
  * - $secondary_menu (array): An array containing the Secondary menu links for
@@ -87,10 +86,6 @@
         </div> <!-- /#name-and-slogan -->
       <?php endif; ?>
 
-      <?php if ($search_box): ?>
-        <div id="search-box"><?php print $search_box; ?></div>
-      <?php endif; ?>
-
       <?php if ($page['header']): ?>
         <div id="header-region" class="region">
           <?php print render($page['header']); ?>
Index: profiles/default/default.install
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.install,v
retrieving revision 1.4
diff -u -u -p -r1.4 default.install
--- profiles/default/default.install	20 Sep 2009 07:32:19 -0000	1.4
+++ profiles/default/default.install	20 Sep 2009 20:55:28 -0000
@@ -21,6 +21,16 @@ function default_install() {
       'cache' => -1,
     ),
     array(
+      'module' => 'search',
+      'delta' => 'form',
+      'theme' => 'garland',
+      'status' => 1,
+      'weight' => -1,
+      'region' => 'sidebar_first',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
       'module' => 'user',
       'delta' => 'login',
       'theme' => 'garland',
Index: themes/garland/maintenance-page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/maintenance-page.tpl.php,v
retrieving revision 1.11
diff -u -u -p -r1.11 maintenance-page.tpl.php
--- themes/garland/maintenance-page.tpl.php	3 Aug 2009 03:04:34 -0000	1.11
+++ themes/garland/maintenance-page.tpl.php	20 Sep 2009 20:55:28 -0000
@@ -63,7 +63,6 @@
 
       <?php if ($sidebar_first): ?>
         <div id="sidebar-first" class="sidebar">
-          <?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
           <?php print $sidebar_first ?>
         </div>
       <?php endif; ?>
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.33
diff -u -u -p -r1.33 page.tpl.php
--- themes/garland/page.tpl.php	15 Sep 2009 17:10:39 -0000	1.33
+++ themes/garland/page.tpl.php	20 Sep 2009 20:55:28 -0000
@@ -24,7 +24,6 @@
 
       <?php if ($page['sidebar_first']): ?>
         <div id="sidebar-first" class="sidebar">
-          <?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
           <?php print render($page['sidebar_first']); ?>
         </div>
       <?php endif; ?>
@@ -48,7 +47,6 @@
 
       <?php if ($page['sidebar_second']): ?>
         <div id="sidebar-second" class="sidebar">
-          <?php if (!$page['sidebar_first'] && $search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
           <?php print render($page['sidebar_second']); ?>
         </div>
       <?php endif; ?>