Merge pull request #19550 from eileenmcnaughton/msg_tpl_convert

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 114158509dd8235af65b68f0b20a02d003d49d14..4548868072b3829189c1fb3fb1ab2217c16182cf 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -12,7 +12,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2020
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
 /**
@@ -358,9 +358,26 @@ return [
     'pseudoconstant' => [
       'callback' => 'CRM_Contact_BAO_GroupContactCache::getModes',
     ],
-    'description' => ts('Should the smart groups be by cron jobs or user actions'),
+    'description' => ts('Should the smart groups be flushed by cron jobs or user actions'),
     'help_text' => ts('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.'),
   ],
+  'acl_cache_refresh_mode' => [
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'acl_cache_refresh_mode',
+    'type' => 'String',
+    'html_type' => 'radio',
+    'default' => 'opportunistic',
+    'add' => '5.37.0',
+    'title' => ts('ACL Group Refresh Mode'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'pseudoconstant' => [
+      'callback' => 'CRM_Contact_BAO_GroupContactCache::getModes',
+    ],
+    'description' => ts('Should the acl cache be by cron jobs or user actions'),
+    'help_text' => ts('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 if your site uses ACLs; this can improve latency on form-submissions but requires more setup.'),
+  ],
   'installed' => [
     'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().',
     'group_name' => 'CiviCRM Preferences',
@@ -544,7 +561,7 @@ return [
     'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => ts('Recaptcha Options'),
+    'title' => ts('reCAPTCHA Options'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => ts('You can specify the reCAPTCHA theme options as comma separated data.(eg: theme:\'blackglass\', lang : \'fr\' ). Check the available options at <a href="https://developers.google.com/recaptcha/docs/display#config">Customizing the Look and Feel of reCAPTCHA</a>.'),
@@ -563,7 +580,7 @@ return [
     'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => ts('Recaptcha Site Key'),
+    'title' => ts('reCAPTCHA Site Key'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -597,7 +614,7 @@ return [
     'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => ts('Recaptcha Secret Key'),
+    'title' => ts('reCAPTCHA Secret Key'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,