Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.17 diff -u -p -r1.17 user.admin.inc --- modules/user/user.admin.inc 10 Jan 2008 21:42:59 -0000 1.17 +++ modules/user/user.admin.inc 16 Jan 2008 08:37:57 -0000 @@ -10,11 +10,6 @@ function user_admin($callback_arg = '') $op = isset($_POST['op']) ? $_POST['op'] : $callback_arg; switch ($op) { - case 'search': - case t('Search'): - $keys = isset($_POST['keys']) ? $_POST['keys'] : NULL; - $output = drupal_get_form('search_form', url('admin/user/search'), $keys, 'user') . search_data($keys, 'user'); - break; case t('Create new account'): case 'create': $output = drupal_get_form('user_register'); Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.887 diff -u -p -r1.887 user.module --- modules/user/user.module 10 Jan 2008 20:22:57 -0000 1.887 +++ modules/user/user.module 16 Jan 2008 08:37:59 -0000 @@ -1025,17 +1025,6 @@ function user_menu() { 'file' => 'user.admin.inc', ); - if (module_exists('search')) { - $items['admin/user/search'] = array( - 'title' => 'Search users', - 'description' => 'Search users by name or e-mail address.', - 'page callback' => 'user_admin', - 'page arguments' => array('search'), - 'access arguments' => array('administer users'), - 'file' => 'user.admin.inc', - ); - } - $items['logout'] = array( 'title' => 'Log out', 'access callback' => 'user_is_logged_in', Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.250 diff -u -p -r1.250 search.module --- modules/search/search.module 8 Jan 2008 10:35:42 -0000 1.250 +++ modules/search/search.module 16 Jan 2008 08:38:00 -0000 @@ -1041,6 +1041,7 @@ function search_form(&$form_state, $acti // that hook into the basic search form. $form['basic']['inline']['processed_keys'] = array('#type' => 'value', '#value' => array()); $form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search')); + $form['#redirect'] = FALSE; return $form; }