Search block not generating results

It appears the search block is broken in the latest search.module. The problem is in the following two functions:

<?php

/**
 * Output a search form for the search block and the theme's search box.
 */
function search_box() {
  // Use search_keys instead of keys to avoid ID conflicts with the search block.
  $form[$form_id .'_keys'] = array(
    '#type' => 'textfield',
    '#size' => 15,
    '#default_value' => '',
    '#attributes' => array('title' => t('Enter the terms you wish to search for.')),
  );
  $form['submit'] = array('#type' => 'submit', '#value' => t('Search'));
  // Always go to the search page since the search form is not guaranteed to be
  // on every page.
  $form['#action'] = url('search/node');
  $form['#base'] = 'search_box_form';

  return $form;
}

/**
 * Process a block search form submission.
 */
function search_box_form_submit($form_id, $form_values) {
  return 'search/node/'. trim($form_values[$form_id .'_keys']);
}

search_box() is the form builder function for the block/theme search box, and it's creating a field name based on $form_id which is not passed to this function. So the textbox is really just named _keys instead of search_form_keys or whatever. When you submit, search_box_form_submit() is receiving a value for $form_id, and since it can't find any matching data in $form_values it's just not appending the search terms to search/node/. I see in the search_box() a comment saying this field is generated using $form_id on to avoid conflict, but I just changed the key both here and in search_box_form_submit() to 'search_box_keys' and it works just fine.

I don't know how to make diffs in Windows or if this is necessary for a bug like this, but if this fix doesn't create any problems, it certainly needs to be applied. (Perhaps it would be better to pass get $form_id into the builder function somehow, but I don't see why the field needs to be named based on that.)