- Patch #266246 by sun, effulgentsia, marcingy: remove smart defaults for system_settings_form().

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc
index 7b7f2fb1f..45f1db44e 100644
--- a/modules/search/search.admin.inc
+++ b/modules/search/search.admin.inc
@@ -83,7 +83,7 @@ function search_admin_settings($form) {
   $form['indexing_throttle']['search_cron_limit'] = array(
     '#type' => 'select',
     '#title' => t('Number of items to index per cron run'),
-    '#default_value' => 100,
+    '#default_value' => variable_get('search_cron_limit', 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')))
   );
@@ -98,7 +98,7 @@ function search_admin_settings($form) {
   $form['indexing_settings']['minimum_word_size'] = array(
     '#type' => 'textfield',
     '#title' => t('Minimum word length to index'),
-    '#default_value' => 3,
+    '#default_value' => variable_get('minimum_word_size', 3),
     '#size' => 5,
     '#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).')
@@ -106,7 +106,7 @@ function search_admin_settings($form) {
   $form['indexing_settings']['overlap_cjk'] = array(
     '#type' => 'checkbox',
     '#title' => t('Simple CJK handling'),
-    '#default_value' => TRUE,
+    '#default_value' => variable_get('overlap_cjk', 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.')
   );
 
@@ -116,7 +116,7 @@ function search_admin_settings($form) {
   );
   $form['active']['search_active_modules'] = array(
     '#type' => 'checkboxes',
-    '#default_value' => array('node', 'user'),
+    '#default_value' => variable_get('search_active_modules', array('node', 'user')),
     '#options' => _search_get_module_names(),
     '#description' => t('Determine which search modules are active from the available modules.')
   );
@@ -131,7 +131,7 @@ function search_admin_settings($form) {
     }
   }
 
-  return system_settings_form($form, TRUE);
+  return system_settings_form($form);
 }
 
 /**