Merge pull request #7529 from rohankatkar/Webtests_Fix_master

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 583efaad50f4addfa82573c78f8d65ffb94c3e12..00bbf3525ec90700d592bfad768d12cbd3f8e169 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -361,50 +361,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',
@@ -484,7 +440,7 @@ return array(
     'html_type' => 'Text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => 'Recaptcha Public Key',
+    'title' => 'Recaptcha Site Key',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -503,7 +459,7 @@ return array(
     'html_type' => 'Text',
     'default' => NULL,
     'add' => '4.3',
-    'title' => 'Recaptcha Private Key',
+    'title' => 'Recaptcha Secret Key',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -609,15 +565,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',
@@ -787,4 +737,30 @@ return array(
     'description' => 'CiviCRM will use this setting as path to bootstrap WP.',
     'help_text' => NULL,
   ),
+  'site_id' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'site_id',
+    'type' => 'String',
+    'default' => '',
+    'add' => '4.6',
+    'title' => 'Unique Site ID',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    '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,
+  ),
 );