? 566678-search-form.patch
? sites/all/modules/devel
? sites/default/files
? sites/default/private
Index: modules/search/search.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.admin.inc,v
retrieving revision 1.11
diff -u -p -r1.11 search.admin.inc
--- modules/search/search.admin.inc	29 Aug 2009 21:05:16 -0000	1.11
+++ modules/search/search.admin.inc	11 Sep 2009 14:05:51 -0000
@@ -69,33 +69,28 @@ function search_admin_settings() {
   $count = format_plural($remaining, 'There is 1 item left to index.', 'There are @count items left to index.');
   $percentage = ((int)min(100, 100 * ($total - $remaining) / max(1, $total))) . '%';
   $status = '<p><strong>' . t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) . ' ' . $count . '</strong></p>';
-  $form['status'] = array('#type' => 'fieldset', '#title' => t('Indexing status'));
-  $form['status']['status'] = array('#markup' => $status);
-  $form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index site'), '#submit' => array('search_admin_reindex_submit'));
+  $form['status'] = array('#markup' => $status);
+  $form['wipe'] = array('#type' => 'submit', '#value' => t('Re-index site'), '#submit' => array('search_admin_reindex_submit'));
 
   $items = drupal_map_assoc(array(10, 20, 50, 100, 200, 500));
 
-  // Indexing throttle:
-  $form['indexing_throttle'] = array(
+  // Indexing fieldset:
+  $form['indexing'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Indexing throttle')
+    '#title' => t('Indexing settings')
   );
-  $form['indexing_throttle']['search_cron_limit'] = array(
+  $form['indexing']['search_cron_limit'] = array(
     '#type' => 'select',
     '#title' => t('Number of items to index per cron run'),
     '#default_value' => 100,
     '#options' => $items,
     '#description' => t('The maximum number of items indexed in each pass of a <a href="@cron">cron maintenance task</a>. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing.', array('@cron' => url('admin/reports/status')))
   );
-  // Indexing settings:
-  $form['indexing_settings'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Indexing settings')
-  );
-  $form['indexing_settings']['info'] = array(
+
+  $form['indexing']['info'] = array(
     '#markup' => t('<p><em>Changing the settings below will cause the site index to be rebuilt. The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed.</em></p><p><em>The default settings should be appropriate for the majority of sites.</em></p>')
   );
-  $form['indexing_settings']['minimum_word_size'] = array(
+  $form['indexing']['minimum_word_size'] = array(
     '#type' => 'textfield',
     '#title' => t('Minimum word length to index'),
     '#default_value' => 3,
@@ -103,14 +98,18 @@ function search_admin_settings() {
     '#maxlength' => 3,
     '#description' => t('The number of characters a word has to be to be indexed. A lower setting means better search result ranking, but also a larger database. Each search query must contain at least one keyword that is this size (or longer).')
   );
-  $form['indexing_settings']['overlap_cjk'] = array(
+  $form['indexing']['overlap_cjk'] = array(
     '#type' => 'checkbox',
     '#title' => t('Simple CJK handling'),
     '#default_value' => TRUE,
     '#description' => t('Whether to apply a simple Chinese/Japanese/Korean tokenizer based on overlapping sequences. Turn this off if you want to use an external preprocessor for this instead. Does not affect other languages.')
   );
-
-  $form['search_active_modules'] = array(
+  // Modules fieldset:
+  $form['modules'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Active modules')
+  );
+  $form['modules']['search_active_modules'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Active search modules'),
     '#default_value' => array('node', 'user'),
@@ -161,4 +160,4 @@ function search_admin_settings_submit($f
 function search_admin_reindex_submit($form, &$form_state) {
   // send the user to the confirmation page
   $form_state['redirect'] = 'admin/config/search/settings/reindex';
-}
\ No newline at end of file
+}