fixed generated data for CRM-15934

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 40f12dcda88a62c3f86fe4e92d7f0f93e034cd26..21d4638173857afafd0f59e1136c50c5c7286103 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
 <?php
 /*
  +--------------------------------------------------------------------+

- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |

  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+


@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+

-*/
+ */

 
 /**
  *
 
 /**
  *


@@ -35,7 +35,7 @@
 /*
  * Settings metadata file
  */
 /*
  * Settings metadata file
  */

-return array (
+return array(

   'contact_view_options' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
   'contact_view_options' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',


@@ -50,10 +50,9 @@ return array (
     'title' => 'Viewing Contacts',
     'is_domain' => '1',
     'is_contact' => 0,
     'title' => 'Viewing Contacts',
     'is_domain' => '1',
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   ),

-

   'contact_edit_options' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
   'contact_edit_options' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',


@@ -68,8 +67,8 @@ return array (
     'title' => 'Editing Contacts',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Editing Contacts',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'advanced_search_options' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'advanced_search_options' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -84,10 +83,10 @@ return array (
     'title' => 'Contact Search',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Contact Search',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   ),

- 'user_dashboard_options' => array(
+  'user_dashboard_options' => array(

     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'user_dashboard_options',
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'user_dashboard_options',


@@ -95,14 +94,14 @@ return array (
     'html_type' => 'checkboxes',
     'pseudoconstant' => array(
       'optionGroupName' => 'user_dashboard_options',
     'html_type' => 'checkboxes',
     'pseudoconstant' => array(
       'optionGroupName' => 'user_dashboard_options',

-     ),
+    ),

     'default' => '\ 11\ 12\ 13\ 14\ 15\ 17\ 18\ 19\ 1',
     'add' => '4.1',
     'title' => 'Contact Dashboard',
     'is_domain' => 1,
     'is_contact' => 0,
     'default' => '\ 11\ 12\ 13\ 14\ 15\ 17\ 18\ 19\ 1',
     'add' => '4.1',
     'title' => 'Contact Dashboard',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'address_options' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'address_options' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -118,8 +117,8 @@ return array (
     'title' => 'Addressing Options',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Addressing Options',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'address_format' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'address_format' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -132,8 +131,8 @@ return array (
     'title' => 'Address Format',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Address Format',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'mailing_format' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'mailing_format' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -146,8 +145,8 @@ return array (
     'title' => 'Mailing Format',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Mailing Format',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'display_name_format' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'display_name_format' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -160,8 +159,8 @@ return array (
     'title' => 'Display Name Format',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Display Name Format',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'sort_name_format' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'sort_name_format' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -174,8 +173,8 @@ return array (
     'title' => 'Sort Name Format',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Sort Name Format',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'editor_id' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'editor_id' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -183,13 +182,13 @@ return array (
     'name' => 'editor_id',
     'type' => 'String',
     'html_type' => 'Text',
     'name' => 'editor_id',
     'type' => 'String',
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.1',
     'title' => 'Wysiwig Editor',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.1',
     'title' => 'Wysiwig Editor',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'contact_ajax_check_similar' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'contact_ajax_check_similar' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -197,13 +196,13 @@ return array (
     'name' => 'contact_ajax_check_similar',
     'type' => 'String',
     'html_type' => 'Text',
     'name' => 'contact_ajax_check_similar',
     'type' => 'String',
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.1',
     'title' => 'Ajax Check Similar',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.1',
     'title' => 'Ajax Check Similar',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'ajaxPopupsEnabled' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'ajaxPopupsEnabled' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -216,8 +215,8 @@ return array (
     'title' => 'Ajax Popups Enabled',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Ajax Popups Enabled',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'activity_assignee_notification' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'activity_assignee_notification' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -225,13 +224,13 @@ return array (
     'name' => 'activity_assignee_notification',
     'type' => 'String',
     'html_type' => 'Text',
     'name' => 'activity_assignee_notification',
     'type' => 'String',
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.1',
     'title' => 'Notify Activity Assignees',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.1',
     'title' => 'Notify Activity Assignees',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'activity_assignee_notification_ics' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'activity_assignee_notification_ics' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -239,13 +238,13 @@ return array (
     'name' => 'activity_assignee_notification_ics',
     'type' => 'String',
     'html_type' => 'Text',
     'name' => 'activity_assignee_notification_ics',
     'type' => 'String',
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.3',
     'title' => 'Include ICal Invite to Activity Assignees',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.3',
     'title' => 'Include ICal Invite to Activity Assignees',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'contact_autocomplete_options' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'contact_autocomplete_options' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -261,8 +260,8 @@ return array (
     'title' => 'Contact Reference Autocomplete Options',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Contact Reference Autocomplete Options',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'contact_reference_options' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'contact_reference_options' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -278,8 +277,8 @@ return array (
     'title' => 'Contact Reference Options',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Contact Reference Options',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-     'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'max_attachments' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'max_attachments' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -293,21 +292,23 @@ return array (
     'html_attributes' => array(
       'size' => 2,
       'maxlength' => 8,
     'html_attributes' => array(
       'size' => 2,
       'maxlength' => 8,

-     ),
-     'default' => 3,
-     'add' => '4.3',
-     'title' => 'Maximum Attachments',
-     'is_domain' => 1,
-     'is_contact' => 0,
-     'description' => 'Maximum number of files (documents, images, etc.) which can attached to emails or activities.',
-     'help_text' => null,
+    ),
+    'default' => 3,
+    'add' => '4.3',
+    'title' => 'Maximum Attachments',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'Maximum number of files (documents, images, etc.) which can attached to emails or activities.',
+    'help_text' => NULL,

   ),
   'maxFileSize' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'maxFileSize',
   ),
   'maxFileSize' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'maxFileSize',

-    '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
+    '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' => 'Element',
     'html_type' => 'text',
     'type' => 'Integer',
     'quick_form_type' => 'Element',
     'html_type' => 'text',


@@ -321,7 +322,7 @@ return array (
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Maximum Size of file (documents, images, etc.) which can attached to emails or activities.<br />Note: php.ini should support this file size.',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Maximum Size of file (documents, images, etc.) which can attached to emails or activities.<br />Note: php.ini should support this file size.',

-    'help_text' => null,
+    'help_text' => NULL,

   ),
   'contact_undelete' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'contact_undelete' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -335,7 +336,7 @@ return array (
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'If enabled, deleted contacts will be moved to trash (instead of being destroyed). Users with the proper permission are able to search for the deleted contacts and restore them (or delete permanently).',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'If enabled, deleted contacts will be moved to trash (instead of being destroyed). Users with the proper permission are able to search for the deleted contacts and restore them (or delete permanently).',

-    'help_text' => null,
+    'help_text' => NULL,

   ),
   'allowPermDeleteFinancial' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'allowPermDeleteFinancial' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -349,60 +350,102 @@ return array (
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Allow Permanent Delete for contacts who are linked to live financial transactions',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Allow Permanent Delete for contacts who are linked to live financial transactions',

-    'help_text' => null,
+    'help_text' => NULL,

   ),
   'versionAlert' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'versionAlert',
   ),
   'versionAlert' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'versionAlert',

-    'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
+    'type' => 'Integer',
+    'quick_form_type' => 'Element',
+    'html_type' => 'select',
+    'option_values' => array(
+      ts('Disabled'),
+      ts('Display In Page Footer'),
+      ts('Display As Popup Alert'),
+      ts('Page Footer + Popup Alert'),
+    ),

     'default' => 1,
     'add' => '4.3',
     'title' => 'New Version Alerts',
     'is_domain' => 1,
     'is_contact' => 0,
     'default' => 1,
     'add' => '4.3',
     'title' => 'New Version Alerts',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => 'Displays an on-screen alert to users with "Administer CiviCRM" permissions when a new version of CiviCRM is available. This setting will only work if the "Version Check & Statistics Reporting" setting is enabled.',
-    'help_text' => null,
+    'description' => "",
+    'help_text' => NULL,
+  ),
+  'securityUpdateAlert' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'securityUpdateAlert',
+    'type' => 'Integer',
+    'quick_form_type' => 'Element',
+    'html_type' => 'select',
+    'option_values' => array(
+      ts('Disabled'),
+      ts('Display In Page Footer'),
+      ts('Display As Popup Alert'),
+      ts('Page Footer + Popup Alert'),
+    ),
+    'default' => 3,
+    'add' => '4.6',
+    'title' => 'Security Update Alerts',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => "",
+    'help_text' => NULL,

   ),
   'versionCheck' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'versionCheck',
   ),
   'versionCheck' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'versionCheck',

-    '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' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.3',
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.3',

-    'title' => 'Version Check & Statistics Reporting',
+    '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,
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => "If enabled, CiviCRM automatically checks availablity of a newer version of the software. New version alerts will be displayed on the main CiviCRM Administration page.
-When enabled, statistics about your CiviCRM installation are reported anonymously to the CiviCRM team to assist in prioritizing ongoing development efforts. The following information is gathered: CiviCRM version, versions of PHP, MySQL and framework (Drupal/Joomla/standalone), and default language. Counts (but no actual data) of the following record types are reported: contacts, activities, cases, relationships, contributions, contribution pages, contribution products, contribution widgets, discounts, price sets, profiles, events, participants, tell-a-friend pages, grants, mailings, memberships, membership blocks, pledges, pledge blocks and active payment processor types.",
-    'help_text' => null,
+    'description' => "",
+    'help_text' => NULL,

   ),
   'securityAlert' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
   ),
   'securityAlert' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',

-    'name' => 'versionCheck',
-    'prefetch' => 0,
+    'name' => 'securityAlert',

     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.4',
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'add' => '4.4',

-    'title' => 'Security Alerts',
+    'title' => 'Security Audits',

     'is_domain' => 1,
     'is_contact' => 0,
     'description' => "If enabled, CiviCRM will automatically run checks for significant mis-configurations such as ineffective file protections.",
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => "If enabled, CiviCRM will automatically run checks for significant mis-configurations such as ineffective file protections.",

-    'help_text' => null,
+    'help_text' => NULL,

   ),
   'doNotAttachPDFReceipt' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'doNotAttachPDFReceipt',
   ),
   'doNotAttachPDFReceipt' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'doNotAttachPDFReceipt',

-    'prefetch' => 1,  // prefetch causes it to be cached in config object. 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
+    'prefetch' => 1,
+    // prefetch causes it to be cached in config object. 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' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,


@@ -411,126 +454,108 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => "If enabled, CiviCRM sends PDF receipt as an attachment during event signup or online contribution.",
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => "If enabled, CiviCRM sends PDF receipt as an attachment during event signup or online contribution.",

-    'help_text' => null,
+    'help_text' => NULL,

   ),
   'wkhtmltopdfPath' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'wkhtmltopdfPath',
   ),
   'wkhtmltopdfPath' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'wkhtmltopdfPath',

-    '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
+    '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' => 'String',
     'quick_form_type' => 'Element',
     'type' => 'String',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 256,
     ),
     'html_type' => 'Text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 256,
     ),
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.3',
     'title' => 'Path to wkhtmltopdf executable',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.3',
     'title' => 'Path to wkhtmltopdf executable',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'recaptchaPublicKey' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'recaptchaPublicKey',
   ),
   'recaptchaPublicKey' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'recaptchaPublicKey',

-    '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
+    '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' => 'String',
     'quick_form_type' => 'Element',
     'type' => 'String',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 64,
     ),
     'html_type' => 'Text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 64,
     ),
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.3',
     'title' => 'Recaptcha Public Key',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.3',
     'title' => 'Recaptcha Public Key',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
-  ),
-  'recaptchaPrivateKey' => array(
-    'group_name' => 'CiviCRM Preferences',
-    'group' => 'core',
-    'name' => 'recaptchaPrivateKey',
-    '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' => 'String',
-    'quick_form_type' => 'Element',
-    'html_type' => 'text',
-    'html_attributes' => array(
-      'size' => 64,
-      'maxlength' => 64,
-    ),
-    'html_type' => 'Text',
-    'default' => null,
-    'add' => '4.3',
-    'title' => 'Recaptcha Private Key',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'recaptchaPrivateKey' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'recaptchaPrivateKey',
   ),
   'recaptchaPrivateKey' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'recaptchaPrivateKey',

-    '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
+    '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' => 'String',
     'quick_form_type' => 'Element',
     'type' => 'String',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 64,
     ),
     'html_type' => 'Text',
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 64,
     ),
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.3',
     'title' => 'Recaptcha Private Key',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.3',
     'title' => 'Recaptcha Private Key',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'dashboardCacheTimeout' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'dashboardCacheTimeout',
   ),
   'dashboardCacheTimeout' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'dashboardCacheTimeout',

-    '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
+    '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' => 'Element',
     'type' => 'Integer',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 3,
       'maxlength' => 5,
     ),
     'html_type' => 'Text',
     'html_attributes' => array(
       'size' => 3,
       'maxlength' => 5,
     ),
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.3',
     'title' => 'Dashboard cache timeout',
     'is_domain' => 1,
     'is_contact' => 0,
     'add' => '4.3',
     'title' => 'Dashboard cache timeout',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
-    ),
+    'description' => NULL,
+    'help_text' => NULL,
+  ),

   'checksumTimeout' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'checksumTimeout',
   'checksumTimeout' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'checksumTimeout',

-    '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
+    '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',
     'type' => 'Integer',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 2,
       'maxlength' => 8,
     'html_attributes' => array(
       'size' => 2,
       'maxlength' => 8,


@@ -541,8 +566,8 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'title' => 'Checksum Lifespan',
     'is_domain' => 1,
     'is_contact' => 0,
     'title' => 'Checksum Lifespan',
     'is_domain' => 1,
     'is_contact' => 0,

-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,

   ),
   'blogUrl' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'blogUrl' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -551,7 +576,6 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',
     'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 128,
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 128,


@@ -572,7 +596,6 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',
     'prefetch' => 0,
     'type' => 'String',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 128,
     'html_attributes' => array(
       'size' => 64,
       'maxlength' => 128,


@@ -590,23 +613,24 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'resCacheCode',
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'resCacheCode',

-    '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
+    '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' => 'String',
     'quick_form_type' => 'Element',
     'type' => 'String',
     'quick_form_type' => 'Element',

-    'html_type' => 'text',

     'html_attributes' => array(
       'size' => 16,
       'maxlength' => 16,
     ),
     'html_type' => 'Text',
     'html_attributes' => array(
       'size' => 16,
       'maxlength' => 16,
     ),
     'html_type' => 'Text',

-    'default' => null,
+    'default' => NULL,

     'add' => '4.3',
     'title' => 'Resource Cache Code',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Code appended to resource URLs (JS/CSS) to coerce HTTP caching',
     'add' => '4.3',
     'title' => 'Resource Cache Code',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Code appended to resource URLs (JS/CSS) to coerce HTTP caching',

-    'help_text' => null,
+    'help_text' => NULL,

   ),
   'verifySSL' => array(
     'group_name' => 'CiviCRM Preferences',
   ),
   'verifySSL' => array(
     'group_name' => 'CiviCRM Preferences',


@@ -629,7 +653,8 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'type' => 'String',
     'html_type' => 'text',
     'quick_form_type' => 'Element',
     'type' => 'String',
     'html_type' => 'text',
     'quick_form_type' => 'Element',

-    '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
+    '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

     'default' => '',
     'add' => '4.3',
     'title' => 'WordPress Base Page',
     'default' => '',
     'add' => '4.3',
     'title' => 'WordPress Base Page',


@@ -642,7 +667,8 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'secondDegRelPermissions',
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'secondDegRelPermissions',

-    '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
+    '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,
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 0,


@@ -651,13 +677,12 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => "If enabled, contacts with the permission to edit a related contact will inherit that contact's permission to edit other related contacts",
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => "If enabled, contacts with the permission to edit a related contact will inherit that contact's permission to edit other related contacts",

-    'help_text' => null,
+    'help_text' => NULL,

   ),
   ),

-

   'enable_components' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
   'enable_components' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',

-    'name'  => 'enable_components',
+    'name' => 'enable_components',

     'type' => 'Array',
     'quick_form_type' => 'Element',
     'html_type' => 'advmultiselect',
     'type' => 'Array',
     'quick_form_type' => 'Element',
     'html_type' => 'advmultiselect',


@@ -667,18 +692,18 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
       'class' => 'advmultiselect',
     ),
     'default' => array('CiviEvent', 'CiviContribute', 'CiviMember', 'CiviMail', 'CiviReport', 'CiviPledge'),
       'class' => 'advmultiselect',
     ),
     'default' => array('CiviEvent', 'CiviContribute', 'CiviMember', 'CiviMail', 'CiviReport', 'CiviPledge'),

-    'add'   => '4.4',
+    'add' => '4.4',

     'title' => 'Enable Components',
     'is_domain' => '1',
     'is_contact' => 0,
     'title' => 'Enable Components',
     'is_domain' => '1',
     'is_contact' => 0,

-    'description' => null,
-    'help_text'   => null,
+    'description' => NULL,
+    'help_text' => NULL,

     'on_change' => array(
     'on_change' => array(

-      array('CRM_Case_Info', 'onToggleComponents'),
-      array('CRM_Core_Component', 'flushEnabledComponents'),
+      'CRM_Case_Info::onToggleComponents',
+      'CRM_Core_Component::flushEnabledComponents',
+      'call://resources/resetCacheCode',

     ),
   ),
     ),
   ),

-

   'disable_core_css' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
   'disable_core_css' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',


@@ -697,7 +722,8 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'empoweredBy',
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'empoweredBy',

-    '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
+    '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,
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,


@@ -706,6 +732,6 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'When enabled, "empowered by CiviCRM" is displayed at the bottom of public forms.',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'When enabled, "empowered by CiviCRM" is displayed at the bottom of public forms.',

-    'help_text' => null,
+    'help_text' => NULL,

   ),
 );
   ),
 );