X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FCore.setting.php;h=89dd7d150c454205b0343ab9f76cf08e617bd688;hb=f76ec5595fad4b8ee72827f23b3b76eaf6eb2868;hp=1d483c4c286e0cb797c0c5328890ca1fb9ff85ee;hpb=7e0b07cc965bf046d593449ddfde15defe14cda5;p=civicrm-core.git

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 1d483c4c28..89dd7d150c 100644
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
  * $Id$
  *
  */
@@ -294,6 +294,21 @@ return array(
     'description' => NULL,
     'help_text' => NULL,
   ),
+  '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',
+    'group' => 'core',
+    'name' => 'installed',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => FALSE,
+    'add' => '4.7',
+    'title' => 'System Installed',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'A flag indicating whether this system has run a post-installation routine',
+    'help_text' => NULL,
+  ),
   'max_attachments' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -361,50 +376,6 @@ return array(
     'description' => 'Allow Permanent Delete for contacts who are linked to live financial transactions',
     'help_text' => NULL,
   ),
-  'versionAlert' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'versionAlert',
-    'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
-    'default' => 1,
-    'add' => '4.3',
-    'title' => 'New Version Alerts',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "",
-    'help_text' => NULL,
-  ),
-  'versionCheck' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'versionCheck',
-    'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
-    'default' => 1,
-    'add' => '4.3',
-    'title' => 'Automatically Check for Updates',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "",
-    'help_text' => NULL,
-  ),
-  'versionCheckIgnoreDate' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'versionCheckIgnoreDate',
-    'type' => 'String',
-    'quick_form_type' => 'Element',
-    'html_type' => 'text',
-    'html_attributes' => array('placeholder' => 'YYYY-MM-DD'),
-    'default' => '',
-    'add' => '4.6',
-    'title' => 'Ignore Updates Prior to',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "",
-    'help_text' => NULL,
-  ),
   'securityAlert' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -609,15 +580,9 @@ return array(
     'group' => 'core',
     'name' => 'resCacheCode',
     'type' => 'String',
-    'quick_form_type' => 'Element',
-    'html_attributes' => array(
-      'size' => 16,
-      'maxlength' => 16,
-    ),
-    'html_type' => 'Text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => 'Resource Cache Code',
+    'title' => 'resCacheCode',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Code appended to resource URLs (JS/CSS) to coerce HTTP caching',
@@ -734,6 +699,21 @@ return array(
     'description' => 'When enabled, "empowered by CiviCRM" is displayed at the bottom of public forms.',
     'help_text' => NULL,
   ),
+  'logging_no_trigger_permission' => array(
+    'add' => '4.7',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'help_text' => ts('(EXPERIMENTAL) If the MySQL user does not have permission to administer triggers, then you must create the triggers outside CiviCRM. No support is provided for this configuration.'),
+    'name' => 'logging_no_trigger_permission',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'html_type' => '',
+    'default' => 0,
+    'title' => '(EXPERIMENTAL) MySQL user does not have trigger permissions',
+    'description' => 'Set this when you intend to manage trigger creation outside of CiviCRM',
+  ),
   'logging' => array(
     'add' => '4.7',
     'help_text' => NULL,
@@ -800,4 +780,17 @@ return array(
     'description' => NULL,
     'help_text' => NULL,
   ),
+  'systemStatusCheckResult' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'systemStatusCheckResult',
+    'type' => 'Integer',
+    'default' => 0,
+    'add' => '4.7',
+    'title' => 'systemStatusCheckResult',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => NULL,
+    'help_text' => NULL,
+  ),
 );