Index: search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.198
diff -u -F^f -r1.198 search.module
--- search.module	17 Sep 2006 19:14:15 -0000	1.198
+++ search.module	4 Oct 2006 16:21:41 -0000
@@ -1045,7 +1045,7 @@ function search_form_submit($form_id, $f
 /**
  * Output a search form for the search block and the theme's search box.
  */
-function search_box() {
+function search_box($form_id) {
   // Use search_keys instead of keys to avoid ID conflicts with the search block.
   $form[$form_id .'_keys'] = array(
     '#type' => 'textfield',
@@ -1285,7 +1285,13 @@ function theme_search_page($results, $ty
 }
 
 function search_forms() {
-  $forms['search_theme_form']['callback'] = 'search_box';
-  $forms['search_block_form']['callback'] = 'search_box';
+  $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'),
+  );
   return $forms;
 }