CRM-18667 Dedupe regression bug (4.7.8rc) merge contacts action from task list fails...

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 89dd7d150c454205b0343ab9f76cf08e617bd688..531050eb36968e56cb6feb3a9e99c5049f2c0f5a 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -294,6 +294,23 @@ return array(
     'description' => NULL,
     'help_text' => NULL,
   ),
+  'smart_group_cache_refresh_mode' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'smart_group_cache_refresh_mode',
+    'type' => 'String',
+    'html_type' => 'radio',
+    'default' => 'opportunistic',
+    'add' => '4.7',
+    'title' => 'Smart Group Refresh Mode',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'pseudoconstant' => array(
+      'callback' => 'CRM_Contact_BAO_GroupContactCache::getModes',
+    ),
+    'description' => 'Should the smart groups be by cron jobs or user actions',
+    'help_text' => 'In "Opportunistic Flush" mode, caches are flushed in response to user actions; this mode is broadly compatible but may add latency during form-submissions. In "Cron Flush" mode, you should schedule a cron job to flush caches; this can improve latency on form-submissions but requires more setup.',
+  ),
   'installed' => array(
     'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().',
     'group_name' => 'CiviCRM Preferences',
@@ -733,6 +750,36 @@ return array(
       'CRM_Logging_Schema::onToggle',
     ),
   ),
+  'logging_uniqueid_date' => array(
+    'add' => '4.7',
+    'help_text' => ts('This is the date when CRM-18193 was implemented'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'logging_uniqueid_date',
+    'type' => 'Date',
+    'quick_form_type' => 'DateTime',
+    'html_type' => '',
+    'default' => NULL,
+    'title' => 'Logging Unique ID not recorded before',
+    'description' => 'This is the date when CRM-18193 was implemented',
+  ),
+  'logging_all_tables_uniquid' => array(
+    'add' => '4.7',
+    'help_text' => ts('This indicates there are no tables holdng pre-uniqid log_conn_id values (CRM-18193)'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'logging_all_tables_uniquid',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'html_type' => '',
+    'default' => 0,
+    'title' => 'All tables use Unique Connection ID',
+    'description' => 'Do some tables pre-date CRM-18193?',
+  ),
   'userFrameworkUsersTableName' => array(
     'add' => '4.7',
     'help_text' => NULL,