Index: search_config.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/search_config/search_config.module,v retrieving revision 1.9.2.8 diff -u -p -r1.9.2.8 search_config.module --- search_config.module 26 Apr 2010 18:30:18 -0000 1.9.2.8 +++ search_config.module 11 Jun 2010 19:56:10 -0000 @@ -33,16 +33,19 @@ function search_config_form_alter(&$form // in the "Advanced search settings" fieldset in admin/settings/search if ($form_id == 'search_theme_form') { $form['#submit'] = array('search_config_form_submit'); - $form['module']['#value'] = variable_get('search_config_default_search', 'node'); - $form['module']['#type'] = 'value'; $form['processed_keys'] = $form['search_theme_form_keys']; $form['processed_keys']['#weight'] = -1; unset($form['search_theme_form_keys']); + // enforce default search settings on the search block. + _search_config_default_search($form); } if ($form_id == 'search_form') { - $default_search = variable_get('search_config_default_search', 'node'); - + // enforce default search settings. + if (trim(request_uri(), '/') == 'search') { + _search_config_default_search($form); + } + // Keywords if (user_access('use keyword search')) { if (variable_get('search_config_disable_or', 0)) { @@ -341,3 +344,14 @@ function search_config_db_rewrite_sql($q } } } + +/** + * Private function for altering the destination of the search block + * and search form. + */ +function _search_config_default_search(&$form) { + $default_search = variable_get('search_config_default_search', 'node'); + $form['#action'] = url('search/' . $default_search); + $form['module']['#value'] = $default_search; + $form['module']['#type'] = 'value'; +} \ No newline at end of file