Merge pull request #6987 from xurizaemon/CRM-17212

[civicrm-core.git] / settings / Search.setting.php

diff --git a/settings/Search.setting.php b/settings/Search.setting.php
index 7cb0d454df9888cdc39b968713ddaa87bce046d9..90faa869ee70d9d858429322c23c49e5246f12a1 100644 (file)
--- a/settings/Search.setting.php
+++ b/settings/Search.setting.php
@@ -40,7 +40,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'search_autocomplete_count',
-    'prefetch' => 0,
     'type' => 'Integer',
     'quick_form_type' => 'Element',
     'html_type' => 'text',
@@ -60,7 +59,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'enable_innodb_fts',
-    'prefetch' => 0,
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 0,
@@ -78,7 +76,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'fts_query_mode',
-    'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',
     'html_attributes' => array(
@@ -98,8 +95,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'includeOrderByClause',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
@@ -114,8 +109,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'includeWildCardInName',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
@@ -130,8 +123,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'includeEmailInName',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
@@ -146,8 +137,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'includeNickNameInName',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 0,
@@ -162,8 +151,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'includeAlphabeticalPager',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
@@ -178,8 +165,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'smartGroupCacheTimeout',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Integer',
     'quick_form_type' => 'Element',
     'html_type' => 'text',
@@ -195,8 +180,6 @@ return array(
     'group_name' => 'Search Preferences',
     'group' => 'Search Preferences',
     'name' => 'defaultSearchProfileID',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
     'type' => 'Integer',
     'quick_form_type' => 'Select',
     'html_type' => 'Select',
@@ -214,42 +197,4 @@ return array(
     'description' => 'If set, this will be the default profile used for contact search.',
     'help_text' => NULL,
   ),
-  'autocompleteContactSearch' => array(
-    'group_name' => 'Search Preferences',
-    'group' => 'Search Preferences',
-    'name' => 'autocompleteContactSearch',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
-    'config_only' => 1,
-    //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
-    'type' => 'Integer',
-    'quick_form_type' => 'CheckBox',
-    'default' => 1,
-    'add' => '4.6',
-    'title' => 'Autocomplete Contact Search',
-    'pseudoconstant' => array('optionGroupName' => 'contact_autocomplete_options'),
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "Selected fields will be displayed in back-office autocomplete dropdown search results (Quick Search, etc.). Contact Name is always included.",
-    'help_text' => NULL,
-  ),
-  'autocompleteContactReference' => array(
-    'group_name' => 'Search Preferences',
-    'group' => 'Search Preferences',
-    'name' => 'autocompleteContactReference',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
-    'config_only' => 1,
-    //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
-    'type' => 'Integer',
-    'quick_form_type' => 'CheckBox',
-    'default' => 1,
-    'add' => '4.6',
-    'title' => 'Contact Reference Options',
-    'pseudoconstant' => array('optionGroupName' => 'contact_reference_options'),
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "Selected fields will be displayed in autocomplete dropdown search results for 'Contact Reference' custom fields. Contact Name is always included. NOTE: You must assign 'access contact reference fields' permission to the anonymous role if you want to use custom contact reference fields in profiles on public pages. For most situations, you should use the 'Limit List to Group' setting when configuring a contact reference field which will be used in public forms to prevent exposing your entire contact list.",
-    'help_text' => NULL,
-  ),
 );